diff --git a/Makefile b/Makefile
index d7687c0d8f..2c9bfa1cf7 100644
--- a/Makefile
+++ b/Makefile
@@ -473,7 +473,7 @@ start: cleanup compile-module
 	echo "$$REDIS_UDS" | redis-server -
 	echo "$$REDIS_UNAVAILABLE_CONF" | redis-server -
 	redis-cli -a cluster --cluster create 127.0.0.1:7479 127.0.0.1:7480 127.0.0.1:7481 --cluster-yes
-	docker run -p 6479:6379 --name jedis-stack -e PORT=6379 -d redislabs/client-libs-test:8.0-M04-pre
+	docker run -p 6479:6379 --name jedis-stack -e PORT=6379 -d redislabs/client-libs-test:8.0.2
 
 cleanup:
 	- rm -vf /tmp/redis_cluster_node*.conf 2>/dev/null
diff --git a/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java b/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java
index 4ea7457075..a27e1d5958 100644
--- a/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java
+++ b/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java
@@ -276,7 +276,7 @@ public void testCloseConnectionOnMakeObject() {
       int currentClientCount = getClientCount(jedis.clientList());
       assertThrows(JedisAccessControlException.class, pool::getResource);
       // wait for the redis server to close the connection
-      await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS)
+      await().pollDelay(Duration.ofMillis(10)).atMost(500, MILLISECONDS)
           .until(() -> getClientCount(jedis.clientList()) == currentClientCount);
       assertEquals(currentClientCount, getClientCount(jedis.clientList()));
     }
diff --git a/src/test/java/redis/clients/jedis/JedisPoolTest.java b/src/test/java/redis/clients/jedis/JedisPoolTest.java
index 958a01ca5e..4fc84dd58a 100644
--- a/src/test/java/redis/clients/jedis/JedisPoolTest.java
+++ b/src/test/java/redis/clients/jedis/JedisPoolTest.java
@@ -397,7 +397,7 @@ public void testCloseConnectionOnMakeObject() {
       int currentClientCount = getClientCount(jedis.clientList());
       assertThrows(JedisAccessControlException.class, pool::getResource);
       // wait for the redis server to close the connection
-      await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS)
+      await().pollDelay(Duration.ofMillis(10)).atMost(500, MILLISECONDS)
           .until(() -> getClientCount(jedis.clientList()) == currentClientCount);
       assertEquals(currentClientCount, getClientCount(jedis.clientList()));
     }
diff --git a/src/test/resources/env/.env b/src/test/resources/env/.env
index f83667b796..af18ea8236 100644
--- a/src/test/resources/env/.env
+++ b/src/test/resources/env/.env
@@ -1,5 +1,5 @@
-REDIS_VERSION=8.0-RC2-pre
-REDIS_STACK_VERSION=8.0-RC2-pre
+REDIS_VERSION=8.0.2
+REDIS_STACK_VERSION=8.0.2
 CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
 REDIS_ENV_CONF_DIR=./
 REDIS_MODULES_DIR=/tmp
diff --git a/src/test/resources/env/.env.v7.2 b/src/test/resources/env/.env.v7.2
index 92015eb740..cc3aa3d25f 100644
--- a/src/test/resources/env/.env.v7.2
+++ b/src/test/resources/env/.env.v7.2
@@ -1,2 +1,2 @@
-REDIS_VERSION=7.2.7
-REDIS_STACK_VERSION=rs-7.2.0-v15
\ No newline at end of file
+REDIS_VERSION=7.2.9
+REDIS_STACK_VERSION=rs-7.2.0-v17
\ No newline at end of file
diff --git a/src/test/resources/env/.env.v7.4 b/src/test/resources/env/.env.v7.4
index ee5a54f7d3..e987d70da7 100644
--- a/src/test/resources/env/.env.v7.4
+++ b/src/test/resources/env/.env.v7.4
@@ -1,2 +1,2 @@
-REDIS_VERSION=7.4.2
-REDIS_STACK_VERSION=rs-7.4.0-v2
\ No newline at end of file
+REDIS_VERSION=7.4.4
+REDIS_STACK_VERSION=rs-7.4.0-v5
\ No newline at end of file