diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
index eed24b4..75b9c48 100644
--- a/gateway-service/src/main/resources/application.yml
+++ b/gateway-service/src/main/resources/application.yml
@@ -45,6 +45,7 @@ spring:
                 - Path=/api/rag/actuator/**
               filters:
                 - RewritePath=/api/rag/actuator(?<segment>/?.*), /actuator${segment}
+                - AddRequestHeader=X-Forwarded-Prefix, /api/rag
 
             # RAG Service - API endpoints
             - id: rag-service-api
@@ -54,6 +55,7 @@ spring:
                 - Method=GET,POST,PUT,DELETE
               filters:
                 - RewritePath=/api/rag(?<segment>/?.*), ${segment}
+                - AddRequestHeader=X-Forwarded-Prefix, /api/rag
 
             # Analytics Service (will be added later)
             # - id: analytics-service-api
diff --git a/rag-service/src/main/resources/application.properties b/rag-service/src/main/resources/application.properties
index 7eef244..00befa7 100644
--- a/rag-service/src/main/resources/application.properties
+++ b/rag-service/src/main/resources/application.properties
@@ -54,6 +54,7 @@ rag.rerank-fetch-multiplier=2
 swagger.servers.first=http://localhost:8080
 springdoc.swagger-ui.path=/swagger-ui.html
 springdoc.api-docs.path=/v3/api-docs
+server.forward-headers-strategy=framework
 #Kafka
 spring.kafka.bootstrap-servers=${KAFKA_BOOTSTRAP_SERVERS:localhost:9092}
 analytics.kafka.topic=user-events
\ No newline at end of file