diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 698ca5d..79b5708 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        erlang: [19, 20, 21, 22, 23, 24]
+        erlang: [21, 22, 23, 24, 25]
 
     container:
       image: erlang:${{ matrix.erlang }}
@@ -14,8 +14,6 @@ jobs:
     - uses: actions/checkout@v1
     - name: Compile
       run: make compile
-    - name: Elvis rock
-      run: make elvis
     - name: Run xref
       run: make xref
     - name: Run eunit
diff --git a/Makefile b/Makefile
index 3fc7e47..e9f9926 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 CACHEGRIND=qcachegrind
-ELVIS=./bin/elvis
 REBAR3=$(shell which rebar3)
 ifeq ($(REBAR3),)
 REBAR3=./bin/rebar3
@@ -28,10 +27,6 @@ edoc:
 	@echo "Running rebar3 edoc..."
 	@$(REBAR3) as edoc edoc
 
-elvis:
-	@echo "Running elvis rock..."
-	@$(ELVIS) rock
-
 eunit:
 	@echo "Running rebar3 eunit..."
 	@$(REBAR3) do eunit -cv, cover -v
@@ -43,10 +38,10 @@ profile:
 	@_build/profile/lib/fprofx/erlgrindx -p fprofx.analysis
 	@$(CACHEGRIND) fprofx.cgrind
 
-test: elvis xref eunit dialyzer
+test: xref eunit dialyzer
 
 xref:
 	@echo "Running rebar3 xref..."
 	@$(REBAR3) xref
 
-.PHONY: bench clean compile dialyzer edoc elvis eunit profile xref
+.PHONY: bench clean compile dialyzer edoc eunit profile xref
diff --git a/README.md b/README.md
index 0a2b2d7..0baa9a5 100644
--- a/README.md
+++ b/README.md
@@ -261,7 +261,6 @@ key(Client, Key) ->
 
 ```makefile
 make dialyzer
-make elvis
 make eunit
 make xref
 ```
diff --git a/bin/elvis b/bin/elvis
deleted file mode 100755
index ddb9fe7..0000000
Binary files a/bin/elvis and /dev/null differ
diff --git a/elvis.config b/elvis.config
deleted file mode 100644
index fc3bbfe..0000000
--- a/elvis.config
+++ /dev/null
@@ -1,35 +0,0 @@
-[{elvis, [
-  {config, [
-    #{dirs => ["src", "test"],
-      filter => "*.erl",
-      rules => [
-        {elvis_style, dont_repeat_yourself, #{min_complexity => 10}},
-        {elvis_style, god_modules, #{limit => 25}},
-        {elvis_style, invalid_dynamic_call, #{ignore => [
-            shackle_hooks,
-            shackle_ssl_server,
-            shackle_tcp_server,
-            shackle_tests,
-            shackle_udp_server,
-            shackle_utils
-        ]}},
-        {elvis_style, line_length, #{limit => 80, skip_comments => false}},
-        {elvis_style, macro_names},
-        {elvis_style, module_naming_convention, #{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$", ignore => []}},
-        {elvis_style, nesting_level, #{level => 3}},
-        {elvis_style, no_behavior_info},
-        {elvis_style, no_if_expression},
-        {elvis_style, no_spec_with_records},
-        {elvis_style, no_tabs},
-        {elvis_style, no_trailing_whitespace},
-        {elvis_style, operator_spaces, #{rules => [{right, ","}, {right, "++"}, {left, "++"}]}},
-        {elvis_style, state_record_and_type},
-        {elvis_style, used_ignored_variable}
-      ]},
-    #{dirs => ["."],
-      filter => "elvis.config",
-      rules => [
-        {elvis_project, old_configuration_format}
-      ]}
-  ]}
-]}].
diff --git a/rebar.config b/rebar.config
index a536cd6..8b5ca79 100644
--- a/rebar.config
+++ b/rebar.config
@@ -22,10 +22,10 @@
 
 {erl_opts, [
   debug_info,
-  {platform_define, "^21.3|^22|^23|^24", 'ATOMICS'},
-  {platform_define, "^23|^24", 'DECENTRALIZED_COUNTERS'},
+  {platform_define, "^21.3|^22|^23|^24|^25", 'ATOMICS'},
+  {platform_define, "^23|^24|^25", 'DECENTRALIZED_COUNTERS'},
   {platform_define, "^18|^19|^2", 'ETS_TAKE'},
-  {platform_define, "^21|^22|^23|^24", 'SSL_HANDSHAKE'}
+  {platform_define, "^21|^22|^23|^24|^25", 'SSL_HANDSHAKE'}
 ]}.
 
 {plugins, [rebar3_hex]}.