diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties
index 2de288c57..6b1fcb277 100644
--- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties
+++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties
@@ -7,10 +7,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-
-server.tomcat.protocol-header=X-Forwarded-Proto
-# IBM Adresses unpredictable
-server.tomcat.internal-proxies=.*
+server.use-forward-headers=true
 
 # Sandbox, small files only
 spring.servlet.multipart.max-file-size=100KB
@@ -41,4 +38,3 @@ hawkbit.server.ui.demo.disclaimer=<small>By signing in, you consent that we stor
   <p>You are not permitted to store any kind of personal data in this application, since this is a shared account. \
   Furthermore, this sandbox is reset once a week deleting all data.</p> \
   <p><b>Credentials:</b> <code>${hawkbit.server.ui.demo.user}:${hawkbit.server.ui.demo.password}</code></p></small>
-