diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 551a1b3..a8c85f7 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -30,16 +30,17 @@ jobs:
       max-parallel: 8
       matrix:
         include:
-          - {redis: '7.2', ruby: '3.4'}
-          - {redis: '7.2', ruby: '3.4', compose: compose.ssl.yaml}
-          - {redis: '7.2', ruby: '3.4', driver: 'hiredis'}
-          - {redis: '7.2', ruby: '3.4', driver: 'hiredis', compose: compose.ssl.yaml}
-          - {redis: '7.2', ruby: '3.4', compose: compose.replica.yaml, replica: '2'}
-          - {redis: '8',   ruby: '3.3', compose: compose.valkey.yaml, replica: '2'}
-          - {redis: '7.2', ruby: '3.2', compose: compose.auth.yaml}
-          - {redis: '7.0', ruby: '3.1'}
-          - {redis: '6.2', ruby: '3.0'}
-          - {redis: '5.0', ruby: '2.7'}
+          - {redis: '8', ruby: '3.4'}
+          - {redis: '8', ruby: '3.4', compose: compose.ssl.yaml}
+          - {redis: '8', ruby: '3.4', driver: 'hiredis'}
+          - {redis: '8', ruby: '3.4', driver: 'hiredis', compose: compose.ssl.yaml}
+          - {redis: '8', ruby: '3.4', compose: compose.auth.yaml}
+          - {redis: '8', ruby: '3.4', compose: compose.replica.yaml, replica: '2'}
+          - {redis: '8', ruby: '3.4', compose: compose.valkey.yaml, replica: '2'}
+          - {redis: '9', ruby: '3.4', compose: compose.valkey.yaml, replica: '2'}
+          - {redis: '7', ruby: '3.3'}
+          - {redis: '6', ruby: '3.2'}
+          - {redis: '5', ruby: '2.7'}
           - {ruby: 'jruby'}
           - {ruby: 'truffleruby'}
           - {task: test_cluster_down}
@@ -54,7 +55,7 @@ jobs:
           - {task: test_cluster_scale, pattern: 'Transaction', compose: compose.scale.yaml, startup: '8'}
           - {task: test_cluster_scale, pattern: 'PubSub', compose: compose.scale.yaml, startup: '8'}
     env:
-      REDIS_VERSION: ${{ matrix.redis || '7.2' }}
+      REDIS_VERSION: ${{ matrix.redis || '8' }}
       DOCKER_COMPOSE_FILE: ${{ matrix.compose || 'compose.yaml' }}
       REDIS_CONNECTION_DRIVER: ${{ matrix.driver || 'ruby' }}
       REDIS_REPLICA_SIZE: ${{ matrix.replica || '1' }}
@@ -102,7 +103,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     env:
-      REDIS_VERSION: '7.2'
+      REDIS_VERSION: '8'
       DOCKER_COMPOSE_FILE: 'compose.nat.yaml'
     steps:
       - name: Check out code
@@ -139,7 +140,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     env:
-      REDIS_VERSION: '7.2'
+      REDIS_VERSION: '8'
       DOCKER_COMPOSE_FILE: 'compose.latency.yaml'
       REDIS_REPLICA_SIZE: '2'
       REDIS_CLIENT_MAX_THREADS: '10'
@@ -181,7 +182,7 @@ jobs:
           - original_mget
           - emulated_mget
     env:
-      REDIS_VERSION: '7.2'
+      REDIS_VERSION: '8'
       DOCKER_COMPOSE_FILE: 'compose.yaml'
     steps:
       - name: Check out code
@@ -211,7 +212,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     env:
-      REDIS_VERSION: '7.2'
+      REDIS_VERSION: '8'
       DOCKER_COMPOSE_FILE: 'compose.massive.yaml'
       REDIS_SHARD_SIZE: '10'
       REDIS_REPLICA_SIZE: '2'
diff --git a/compose.auth.yaml b/compose.auth.yaml
index eb3394b..c5cba48 100644
--- a/compose.auth.yaml
+++ b/compose.auth.yaml
@@ -1,7 +1,7 @@
 ---
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory            64mb
@@ -41,7 +41,7 @@ services:
     ports:
       - "6384:6379"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.latency.yaml b/compose.latency.yaml
index 761e885..d798dfd 100644
--- a/compose.latency.yaml
+++ b/compose.latency.yaml
@@ -2,7 +2,7 @@
 # 3 shards plus with each 2 replicas simutlated network delay
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory            64mb
@@ -66,7 +66,7 @@ services:
     ports:
       - "6387:6379"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.massive.yaml b/compose.massive.yaml
index 0a5cc53..9f3113c 100644
--- a/compose.massive.yaml
+++ b/compose.massive.yaml
@@ -5,7 +5,7 @@
 # https://github.com/redis/redis/blob/unstable/redis.conf
 services:
   node001: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory                       32mb
@@ -166,7 +166,7 @@ services:
     ports:
       - "6408:6379"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.nat.yaml b/compose.nat.yaml
index f1bb29f..2d157e5 100644
--- a/compose.nat.yaml
+++ b/compose.nat.yaml
@@ -5,7 +5,7 @@
 # DEBUG=1 bundle exec rake 'build_cluster[192.168.11.9,192.168.11.7]'
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory                 64mb
diff --git a/compose.replica.yaml b/compose.replica.yaml
index cacce7e..46f3102 100644
--- a/compose.replica.yaml
+++ b/compose.replica.yaml
@@ -2,7 +2,7 @@
 # 3 shards with double replicas
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory            64mb
@@ -52,7 +52,7 @@ services:
     ports:
       - "6387:6379"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.scale.yaml b/compose.scale.yaml
index 94cafa1..5565ed7 100644
--- a/compose.scale.yaml
+++ b/compose.scale.yaml
@@ -1,7 +1,7 @@
 ---
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory            64mb
@@ -47,7 +47,7 @@ services:
     ports:
       - "6386:6379"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.ssl.yaml b/compose.ssl.yaml
index 97f7bc8..d174349 100644
--- a/compose.ssl.yaml
+++ b/compose.ssl.yaml
@@ -2,7 +2,7 @@
 # @see https://redis.io/docs/manual/security/encryption/
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory            64mb
@@ -257,7 +257,7 @@ services:
     ports:
       - "6384:6384"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.valkey.yaml b/compose.valkey.yaml
index 07b812e..1d4b791 100644
--- a/compose.valkey.yaml
+++ b/compose.valkey.yaml
@@ -1,7 +1,7 @@
 ---
 services:
   node1: &node
-    image: "valkey/valkey:${REDIS_VERSION:-7}"
+    image: "valkey/valkey:${REDIS_VERSION:-9}"
     command: >
       valkey-server
       --maxmemory            64mb
@@ -51,7 +51,7 @@ services:
     ports:
       - "6387:6379"
   clustering:
-    image: "valkey/valkey:${REDIS_VERSION:-7}"
+    image: "valkey/valkey:${REDIS_VERSION:-9}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.yaml b/compose.yaml
index 23af604..3877197 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,7 +1,7 @@
 ---
 services:
   node1: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory            64mb
@@ -39,7 +39,7 @@ services:
     ports:
       - "6384:6379"
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
diff --git a/compose.yaml.erb b/compose.yaml.erb
index dea6c18..425ea3b 100644
--- a/compose.yaml.erb
+++ b/compose.yaml.erb
@@ -5,7 +5,7 @@
 # https://github.com/redis/redis/blob/unstable/redis.conf
 services:
   node001: &node
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       redis-server
       --maxmemory                       32mb
@@ -56,7 +56,7 @@ services:
       - "<%= port + i - 1 %>:<%= port %>"
 <% end %>
   clustering:
-    image: "redis:${REDIS_VERSION:-7}"
+    image: "redis:${REDIS_VERSION:-8}"
     command: >
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null