diff --git a/services/docker-compose-ops.yml b/services/docker-compose-ops.yml
index ff4949f9c43..c5265e44d2a 100644
--- a/services/docker-compose-ops.yml
+++ b/services/docker-compose-ops.yml
@@ -75,14 +75,14 @@ services:
     environment:
       - >-
         REDIS_HOSTS=
-        resources:${REDIS_HOST}:${REDIS_PORT}:0,
-        locks:${REDIS_HOST}:${REDIS_PORT}:1,
-        validation_codes:${REDIS_HOST}:${REDIS_PORT}:2,
-        scheduled_maintenance:${REDIS_HOST}:${REDIS_PORT}:3,
-        user_notifications:${REDIS_HOST}:${REDIS_PORT}:4,
-        announcements:${REDIS_HOST}:${REDIS_PORT}:5,
-        distributed_identifiers:${REDIS_HOST}:${REDIS_PORT}:6,
-        deferred_tasks:${REDIS_HOST}:${REDIS_PORT}:7
+        resources:${REDIS_HOST}:${REDIS_PORT}:0:${REDIS_PASSWORD},
+        locks:${REDIS_HOST}:${REDIS_PORT}:1:${REDIS_PASSWORD},
+        validation_codes:${REDIS_HOST}:${REDIS_PORT}:2:${REDIS_PASSWORD},
+        scheduled_maintenance:${REDIS_HOST}:${REDIS_PORT}:3:${REDIS_PASSWORD},
+        user_notifications:${REDIS_HOST}:${REDIS_PORT}:4:${REDIS_PASSWORD},
+        announcements:${REDIS_HOST}:${REDIS_PORT}:5:${REDIS_PASSWORD},
+        distributed_identifiers:${REDIS_HOST}:${REDIS_PORT}:6:${REDIS_PASSWORD},
+        deferred_tasks:${REDIS_HOST}:${REDIS_PORT}:7:${REDIS_PASSWORD}
       # If you add/remove a db, do not forget to update the --databases entry in the docker-compose.yml
     ports:
       - "18081:8081"
diff --git a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml
index 3cfff68f24f..198e2d6e462 100644
--- a/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml
+++ b/services/web/server/tests/unit/with_dbs/docker-compose-devel.yml
@@ -62,7 +62,16 @@ services:
     image: rediscommander/redis-commander:latest
     restart: always
     environment:
-      - REDIS_HOSTS=resources:redis:6379:0,locks:redis:6379:1,validation_codes:redis:6379:2,scheduled_maintenance:redis:6379:3,user_notifications:redis:6379:4,announcements:redis:6379:5
+      - >-
+        REDIS_HOSTS=
+        resources:redis:6379:0:${TEST_REDIS_PASSWORD},
+        locks:redis:6379:1:${TEST_REDIS_PASSWORD},
+        validation_codes:redis:6379:2:${TEST_REDIS_PASSWORD},
+        scheduled_maintenance:redis:6379:3:${TEST_REDIS_PASSWORD},
+        user_notifications:redis:6379:4:${TEST_REDIS_PASSWORD},
+        announcements:redis:6379:5:${TEST_REDIS_PASSWORD},
+        distributed_identifiers:redis:6379:6:${TEST_REDIS_PASSWORD},
+        deferred_tasks:redis:6379:7:${TEST_REDIS_PASSWORD}
     ports:
       - "18081:8081"