diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
index 3347d21318..9cf82276de 100644
--- a/scripts/docker-compose.yml
+++ b/scripts/docker-compose.yml
@@ -1,18 +1,20 @@
 version: '3.7'
 services:
   redis:
-    image: redis:alpine
-    container_name: redis
+    # Use environment variables to choose between redis (default) or valkey
+    # Usage: CACHE_IMAGE=valkey/valkey:alpine docker compose up
+    image: ${CACHE_IMAGE:-redis:alpine}
+    container_name: ${CACHE_CONTAINER_NAME:-redis}
     healthcheck:
-      test: ['CMD-SHELL', 'redis-cli ping | grep PONG']
+      test: ${CACHE_HEALTHCHECK:-['CMD-SHELL', 'redis-cli ping | grep PONG']}
       interval: 1s
       timeout: 3s
       retries: 5
     ports:
       - '6379:6379'
     volumes:
-      - ./data/redis:/data
-    command: redis-server --appendonly yes
+      - ./data/${CACHE_DATA_DIR:-redis}:/data
+    command: ${CACHE_COMMAND:-redis-server --appendonly yes}
   postgres:
     image: ankane/pgvector
     container_name: postgres
diff --git a/scripts/run-with-redis.sh b/scripts/run-with-redis.sh
new file mode 100755
index 0000000000..904ad89146
--- /dev/null
+++ b/scripts/run-with-redis.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Run docker-compose with Redis
+
+export CACHE_IMAGE="redis:alpine"
+export CACHE_CONTAINER_NAME="redis"
+export CACHE_HEALTHCHECK="['CMD-SHELL', 'redis-cli ping | grep PONG']"
+export CACHE_COMMAND="redis-server --appendonly yes"
+export CACHE_DATA_DIR="redis"
+
+echo "Starting services with Redis..."
+docker compose -f scripts/docker-compose.yml "$@"
diff --git a/scripts/run-with-valkey.sh b/scripts/run-with-valkey.sh
new file mode 100755
index 0000000000..06aa4c5b2c
--- /dev/null
+++ b/scripts/run-with-valkey.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Run docker-compose with Valkey (default)
+
+export CACHE_IMAGE="valkey/valkey:alpine"
+export CACHE_CONTAINER_NAME="valkey"
+export CACHE_HEALTHCHECK="['CMD-SHELL', 'valkey-cli ping | grep PONG']"
+export CACHE_COMMAND="valkey-server --appendonly yes"
+export CACHE_DATA_DIR="valkey"
+
+echo "Starting services with Valkey..."
+docker compose -f scripts/docker-compose.yml "$@"