diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
index 32daa3fa..aaca410f 100644
--- a/.github/workflows/compatibility.yml
+++ b/.github/workflows/compatibility.yml
@@ -105,6 +105,10 @@ jobs:
             redis-version: 7.0
             test_params: "-m valkey"
             label: "Valkey"
+          - python-version: "3.12"
+            redis-version: 8.0
+            test_params: "-m valkey"
+            label: "Valkey"
           - python-version: "3.12"
             redis-version: 7.0
             test_params: "-m redict"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f4b10563..91befbb2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -81,6 +81,10 @@ jobs:
             redis-version: "7.0"
             test_params: "-m valkey"
             label: "Valkey"
+          - python-version: "3.12"
+            redis-version: "8.0"
+            test_params: "-m valkey"
+            label: "Valkey"
           - python-version: "3.12"
             redis-version: "7.0"
             test_params: "-m redict"
diff --git a/docker-compose.yml b/docker-compose.yml
index 17636d0e..9b8dcb67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -322,9 +322,11 @@ services:
       memlock: -1
   valkey:
     image: "valkey/valkey:${VALKEY_VERSION:-unstable}"
+    command: redis-server --port 6379 ${DEFAULT_ARGS---enable-debug-command yes} --appendonly yes
     ports:
       - '12379:6379'
   redict:
     image: "registry.redict.io/redict:${REDICT_VERSION:-latest}"
+    command: redict-server --port 6379 ${DEFAULT_ARGS---enable-debug-command yes} --appendonly yes
     ports:
       - '13379:6379'
diff --git a/tests/conftest.py b/tests/conftest.py
index 31bc6a55..6febbc17 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -32,15 +32,17 @@
 PY_VERSION = version.Version(platform.python_version())
 DOCKER_TAG_MAPPING = {
     "6.2": {
-        "default": "6.2.6",
+        "default": "6.2.16",
         "stack": "6.2.6-v9",
     },
-    "7.0": {"default": "7.0.12", "stack": "7.0.6-RC9"},
-    "7.2": {"default": "7.2.0", "stack": "7.2.0-v0"},
+    "7.0": {"default": "7", "stack": "7.0.6-RC9"},
+    "7.2": {"default": "7.2", "stack": "7.2.0-v13"},
+    "7.4": {"default": "7.4", "stack": "7.4.0-v1"},
+    "8.0": {"default": "latest", "valkey": "8"},
     "latest": {"default": "latest", "stack": "latest"},
     "next": {
-        "stack": "edge",
         "default": "latest",
+        "stack": "edge",
     },
 }
 
@@ -330,18 +332,23 @@ def host_ip_env(host_ip):
 def docker_tags():
     redis_server_version = os.environ.get("COREDIS_REDIS_VERSION", "latest")
     mapping = DOCKER_TAG_MAPPING.get(redis_server_version, {"default": "latest"})
-    os.environ.setdefault(
-        "REDIS_VERSION", mapping.get("standalone", mapping.get("default"))
-    )
-    os.environ.setdefault(
-        "REDIS_SENTINEL_VERSION", mapping.get("sentinel", mapping.get("default"))
-    )
-    os.environ.setdefault(
-        "REDIS_SSL_VERSION", mapping.get("ssl", mapping.get("default"))
-    )
-    os.environ.setdefault(
-        "REDIS_STACK_VERSION", mapping.get("stack", mapping.get("default"))
-    )
+
+    for env, key in {
+        "REDIS_VERSION": "standalone",
+        "REDIS_SENTINEL_VERSION": "sentinel",
+        "REDIS_SSL_VERSION": "ssl",
+        "REDIS_STACK_VERSION": "stack",
+        "KEYDB_VERSION": "keydb",
+        "DRAGONFLY_VERSION": "dragonfly",
+        "VALKEY_VERSION": "valkey",
+        "REDICT_VERSION": "valkey",
+    }.items():
+        try:
+            os.environ.setdefault(env, mapping.get(key, mapping.get("default")))
+        except:
+            import pdb
+
+            pdb.set_trace()
 
     args = SERVER_DEFAULT_ARGS.get(redis_server_version, None)