diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bca98d9..dd54369 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     name: OTP ${{matrix.otp}}
     strategy:
       matrix:
-        otp: ['24.0', '23.3', '22.3', '21.3']
+        otp: ['25.0', '24.3', '23.3', '22.3', '21.3']
     runs-on: 'ubuntu-20.04'
     env:
       OTPVER: ${{ matrix.otp }}
@@ -25,12 +25,12 @@ jobs:
       - run: make deps
       - run: make test
       - run: make dialyzer
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '25.0' }}
       - run: make codecov
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '25.0' }}
       - run: make gcov
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '25.0' }}
       - run: pip install --user codecov
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '25.0' }}
       - run: /home/runner/.local/bin/codecov
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '25.0' }}
diff --git a/Makefile b/Makefile
index 28b41ed..fb7df3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,11 @@
 .PHONY: rel deps test
 
-REBARVER = 3.13.2
-ifeq ($(OTPVER),24.0)
-	REBARVER = 3.15.1
+REBARVER = 3.15.2
+ifeq ($(OTPVER),24.3)
+	REBARVER = 3.17.0
+endif
+ifeq ($(OTPVER),25.0)
+	REBARVER = 3.18.0
 endif
 
 all: deps compile
diff --git a/rebar.config b/rebar.config
index ba605cd..038fa48 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,8 +2,7 @@
 
 {dialyzer,
  [{warnings,
-   [race_conditions,
-    unknown,
+   [unknown,
     unmatched_returns,
     error_handling,
     underspecs