diff --git a/docker-compose.yml b/docker-compose.yml
index ab26b26..4482edd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -82,6 +82,15 @@ services:
   #   networks:
   #     - invoiceninja
   #
+  valkey:
+    image: valkey/valkey:8
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "valkey-cli", "ping" ]
+      start_period: 10s
+    networks:
+      - invoiceninja
+    logging: *default-logging
 
 networks:
   invoiceninja:
diff --git a/env b/env
index eb49e7d..9d99e59 100644
--- a/env
+++ b/env
@@ -7,8 +7,13 @@ PHANTOMJS_PDF_GENERATION=false
 PDF_GENERATOR=snappdf
 TRUSTED_PROXIES='*'
 
+CACHE_DRIVER=redis
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
 
-QUEUE_CONNECTION=database
+REDIS_HOST=valkey
+REDIS_PASSWORD=null
+REDIS_PORT=6379
 
 # DB connection
 DB_HOST=db