diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index ead19e59..d28c41b2 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -15,6 +15,7 @@ server:
   ssl:
     enabled: false
     #TODO: configure SSL with a self-signed certificate
+  forward-headers-strategy: FRAMEWORK
 
 spring:
   config:
@@ -52,6 +53,7 @@ spring:
       - RemoveSecurityHeaders
       # AddSecHeaders appends sec-* headers to proxied requests based on the currently authenticated user
       - AddSecHeaders
+      - PreserveHostHeader
       global-filter:
         websocket-routing:
           enabled: true