diff --git a/docker-compose.yml b/docker-compose.yml
index a4618791..238a6685 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -301,7 +301,7 @@ services:
       - GEOSERVER_DATA_DIR_CUSTOM=/var/geoserver/datadir_template/
       - GEOSERVER_LOGGING_PROFILE=${GEOSERVER_LOGGING_PROFILE}
       - GEOSERVER_CSRF_WHITELIST=${GEOSERVER_CSRF_WHITELIST:?missing/empty}
-      - GEOSERVER_PROXY_BASE_URL=${GEOSERVER_PROXY_BASE_URL:?missing/empty}
+      - PROXY_BASE_URL=${GEOSERVER_PROXY_BASE_URL:?missing/empty}
       # All we want to do is set user.timezone and DALLOW_ENV_PARAMETRIZATION. Due to https://github.com/geosolutions-it/docker-geoserver/issues/133
       # we currently need to pass in all default properties already defined in the dockerfile
       - JAVA_OPTS= >-
diff --git a/etc/geoserver/global.xml b/etc/geoserver/global.xml
index 85bca4d5..443815cb 100644
--- a/etc/geoserver/global.xml
+++ b/etc/geoserver/global.xml
@@ -40,7 +40,7 @@
     <showCreatedTimeColumnsInAdminList>false</showCreatedTimeColumnsInAdminList>
     <showModifiedTimeColumnsInAdminList>false</showModifiedTimeColumnsInAdminList>
     <useHeadersProxyURL>false</useHeadersProxyURL>
-    <proxyBaseUrl>${GEOSERVER_PROXY_BASE_URL}</proxyBaseUrl>
+    <proxyBaseUrl></proxyBaseUrl>
   </settings>
   <jai>
     <allowInterpolation>false</allowInterpolation>