diff --git a/docker/docker-compose.redis-cluster.yml b/docker/docker-compose.redis-cluster.yml
index e27993bf03..63051176c9 100644
--- a/docker/docker-compose.redis-cluster.yml
+++ b/docker/docker-compose.redis-cluster.yml
@@ -20,60 +20,55 @@ services:
 # Redis cluster
 # The latest version of Redis compatible with ThingsBoard is 7.2
   redis-node-0:
-    image: bitnami/redis-cluster:7.2
+    image: bitnami/valkey-cluster:8.0
     volumes:
       - ./tb-node/redis-cluster-data-0:/bitnami/redis/data
     environment:
-      - 'REDIS_PASSWORD=thingsboard'
-      - 'REDISCLI_AUTH=thingsboard'
-      - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
+      - 'VALKEY_PASSWORD=thingsboard'
+      - 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-1:
-    image: bitnami/redis-cluster:7.2
+    image: bitnami/valkey-cluster:8.0
     volumes:
       - ./tb-node/redis-cluster-data-1:/bitnami/redis/data
     depends_on:
       - redis-node-0
     environment:
-      - 'REDIS_PASSWORD=thingsboard'
-      - 'REDISCLI_AUTH=thingsboard'
-      - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
+      - 'VALKEY_PASSWORD=thingsboard'
+      - 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-2:
-    image: bitnami/redis-cluster:7.2
+    image: bitnami/valkey-cluster:8.0
     volumes:
       - ./tb-node/redis-cluster-data-2:/bitnami/redis/data
     depends_on:
       - redis-node-1
     environment:
-      - 'REDIS_PASSWORD=thingsboard'
-      - 'REDISCLI_AUTH=thingsboard'
-      - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
+      - 'VALKEY_PASSWORD=thingsboard'
+      - 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-3:
-    image: bitnami/redis-cluster:7.2
+    image: bitnami/valkey-cluster:8.0
     volumes:
       - ./tb-node/redis-cluster-data-3:/bitnami/redis/data
     depends_on:
       - redis-node-2
     environment:
-      - 'REDIS_PASSWORD=thingsboard'
-      - 'REDISCLI_AUTH=thingsboard'
-      - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
+      - 'VALKEY_PASSWORD=thingsboard'
+      - 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-4:
-    image: bitnami/redis-cluster:7.2
+    image: bitnami/valkey-cluster:8.0
     volumes:
       - ./tb-node/redis-cluster-data-4:/bitnami/redis/data
     depends_on:
       - redis-node-3
     environment:
-      - 'REDIS_PASSWORD=thingsboard'
-      - 'REDISCLI_AUTH=thingsboard'
-      - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
+      - 'VALKEY_PASSWORD=thingsboard'
+      - 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-5:
-    image: bitnami/redis-cluster:7.2
+    image: bitnami/valkey-cluster:8.0
     volumes:
       - ./tb-node/redis-cluster-data-5:/bitnami/redis/data
     depends_on:
@@ -83,11 +78,10 @@ services:
       - redis-node-3
       - redis-node-4
     environment:
-      - 'REDIS_PASSWORD=thingsboard'
-      - 'REDISCLI_AUTH=thingsboard'
-      - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
-      - 'REDIS_CLUSTER_REPLICAS=1'
-      - 'REDIS_CLUSTER_CREATOR=yes'
+      - 'VALKEY_PASSWORD=thingsboard'
+      - 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
+      - 'VALKEY_CLUSTER_REPLICAS=1'
+      - 'VALKEY_CLUSTER_CREATOR=yes'
 
 # ThingsBoard setup to use redis-cluster
   tb-core1:
diff --git a/docker/docker-compose.redis.yml b/docker/docker-compose.redis.yml
index 8ed361428a..3e8934d9a0 100644
--- a/docker/docker-compose.redis.yml
+++ b/docker/docker-compose.redis.yml
@@ -21,7 +21,7 @@ services:
 # The latest version of Redis compatible with ThingsBoard is 7.2
   redis:
     restart: always
-    image: bitnami/redis:7.2
+    image: bitnami/valkey:8.0
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       ALLOW_EMPTY_PASSWORD: "yes"
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
index 525e8d93dc..6ff24564b7 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
@@ -21,15 +21,15 @@ services:
 # The latest version of Redis compatible with ThingsBoard is 7.2
   redis:
     restart: always
-    image: bitnami/redis:7.2
+    image: bitnami/valkey:8.0
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - 'ALLOW_EMPTY_PASSWORD=yes'
-      - 'REDIS_TLS_ENABLED=yes'
-      - 'REDIS_TLS_CERT_FILE=/redis/certs/redis.crt'
-      - 'REDIS_TLS_KEY_FILE=/redis/certs/redis.key'
-      - 'REDIS_TLS_CA_FILE=/redis/certs/redisCA.crt'
-      - 'REDIS_TLS_AUTH_CLIENTS=no'
+      - 'VALKEY_TLS_ENABLED=yes'
+      - 'VALKEY_TLS_CERT_FILE=/redis/certs/redis.crt'
+      - 'VALKEY_TLS_KEY_FILE=/redis/certs/redis.key'
+      - 'VALKEY_TLS_CA_FILE=/redis/certs/redisCA.crt'
+      - 'VALKEY_TLS_AUTH_CLIENTS=no'
     ports:
       - '6379:6379'
     volumes: