diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b688d96f..ddae174c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,7 +139,7 @@ eslint:
   interruptible: true
   services:
     - postgres:11
-    - redis:5
+    - redis:6
   stage: test
   cache:
     key: "$CI_PROJECT_ID__pip_cache"
@@ -215,7 +215,7 @@ build_docs:
   image: $CI_REGISTRY/funkwhale/backend-test-docker:latest
   services:
     - postgres:11
-    - redis:5
+    - redis:6
   cache:
     key: "$CI_PROJECT_ID__pip_cache"
     paths:
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 175833300..09cd59450 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     networks:
       - default
     env_file: .env
-    image: redis:5
+    image: redis:6
     volumes:
       - ./data/redis:/data