diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 19af8a8537..1f0a5d2bdd 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -20,8 +20,8 @@ server:
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
   # Server bind port
   port: "${HTTP_BIND_PORT:8080}"
-  # Server forward headers strategy
-  forward_headers_strategy: "${HTTP_FORWARD_HEADERS_STRATEGY:NONE}"
+  # Server forward headers strategy. Required for SWAGGER UI when reverse proxy is used
+  forward_headers_strategy: "${HTTP_FORWARD_HEADERS_STRATEGY:framework}"
   # Server SSL configuration
   ssl:
     # Enable/disable SSL support
diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile
index 247edd8d9d..92e4893946 100644
--- a/msa/tb-node/docker/Dockerfile
+++ b/msa/tb-node/docker/Dockerfile
@@ -18,9 +18,6 @@ FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 
-# Required for SWAGGER UI when reverse proxy is used
-ENV HTTP_FORWARD_HEADERS_STRATEGY=framework
-
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-node.sh /usr/bin && \
     (yes | dpkg -i /tmp/${pkg.name}.deb) && \