From 754782f620ee8e5ec1e67f73d3ce57efc1f932af Mon Sep 17 00:00:00 2001
From: Marcelo Teixeira Monteiro <1256162+tuxmonteiro@users.noreply.github.com>
Date: Thu, 6 Aug 2026 05:09:24 +0200
Subject: [PATCH] fix(deps): resolve merge conflict in Redis security update
 (#9065)

Validated in local merge-train T5 (base49+contributors+pacocartones)
---
 docker-compose.prod.yml | 2 +-
 docker-compose.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index f65c2b1335..b40b36e8f8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -29,7 +29,7 @@
 services:
   # ── Redis (Rate Limiter Backend) ──────────────────────────────────
   redis:
-    image: redis:8.6.2-alpine
+    image: redis:8.6.5-alpine
     container_name: omniroute-redis-prod
     restart: unless-stopped
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 427b468ccd..870f73ec9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,7 @@ x-common: &common
 services:
   # ── Redis (Rate Limiter Backend) ──────────────────────────────────
   redis:
-    image: docker.io/library/redis:7-alpine
+    image: docker.io/library/redis:8.6.5-alpine
     container_name: omniroute-redis
     restart: unless-stopped
     ports: