diff --git a/.env.broker-template b/.env.broker-template
index 72cdcd5ab..5cfb09171 100644
--- a/.env.broker-template
+++ b/.env.broker-template
@@ -3,7 +3,7 @@
 RUST_LOG=info
 
 REDIS_HOST=redis
-REDIS_IMG=redis:7.2.5-alpine3.19
+REDIS_IMG=valkey/valkey:9.0
 
 POSTGRES_HOST=postgres
 POSTGRES_IMG=postgres:16.3-bullseye
diff --git a/compose.yml b/compose.yml
index a9e1ecfcf..0e824c490 100644
--- a/compose.yml
+++ b/compose.yml
@@ -83,13 +83,13 @@ x-broker-common: &broker-common
 services:
   redis:
     hostname: ${REDIS_HOST:-redis}
-    image: ${REDIS_IMG:-redis:7.2.5-alpine3.19}
+    image: ${REDIS_IMG:-valkey/valkey:9.0}
     restart: always
     ports:
       - 6379:6379
     volumes:
       - redis-data:/data
-    command: redis-server --maxmemory-policy allkeys-lru --save 900 1 --appendonly yes
+    command: valkey-server --maxmemory-policy allkeys-lru --save 900 1 --appendonly yes
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 5s