diff --git a/Changelog.md b/Changelog.md
index 9a523e7f..93a427c1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab: upgrade CE to v18.0.0
 - gitaly: upgrade to v18.0.0
 - gitlab-pages: upgrade to v18.0.0
+- redis: upgrade to v7
 - rubygems: upgrade to v3.6.9
 - ubuntu: upgrade to noble-20250415.1
 
diff --git a/README.md b/README.md
index 50cfefba..18a2e00a 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ Step 2. Launch a redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/data \
-    redis:6.2
+    redis:7
 ```
 
 Step 3. Launch the gitlab container
@@ -387,7 +387,7 @@ To illustrate linking with a redis container, we will use the [redis](https://gi
 First, let's pull the redis image from the docker index.
 
 ```bash
-docker pull redis:6.2
+docker pull redis:7
 ```
 
 Lets start the redis container
@@ -395,7 +395,7 @@ Lets start the redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/data \
-    redis:6.2
+    redis:7
 ```
 
 We are now ready to start the GitLab application.
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8fb66cb3..ca6b4914 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7f8c742d..d33d1dbf 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   redis:
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8864abbc..2ec91a1c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.3'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 12dea678..e7e45e86 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d8a5b876..2dbd1a3f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index ed815750..35a15a0d 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -6,13 +6,12 @@ This is an extend of AWS Remote Backups.
 
 As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb)
 
-
+- [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage)
 - [Available Parameters](#available-parameters)
 - [Installation](#installation)
-- [Maintenance](#maintenance)
-    - [Creating Backups](#creating-backups)
-    - [Restoring Backups](#restoring-backups)
-
+  - [Docker Compose](#docker-compose)
+  - [Creating Backups](#creating-backups)
+  - [Restoring Backups](#restoring-backups)
 
 # Available Parameters
 
@@ -72,7 +71,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:6.2
+    image: sameersbn/redis:7
     command:
     - --loglevel warning
     volumes:
diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml
index b42b387b..0c7991d6 100644
--- a/kubernetes/redis-rc.yml
+++ b/kubernetes/redis-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: redis:6.2
+        image: redis:7
         ports:
         - name: redis
           containerPort: 6379