diff --git a/.env.sample b/.env.sample
index a849fe1377e..b74e48d371c 100644
--- a/.env.sample
+++ b/.env.sample
@@ -86,8 +86,8 @@ RESOLVER=127.0.0.11
 # #################
 GEOSERVER_LB_HOST_IP=geoserver
 GEOSERVER_LB_PORT=8080
-GEOSERVER_WEB_UI_LOCATION={geoserver_ui}/geoserver/
-GEOSERVER_PUBLIC_LOCATION={geoserver_ui}/geoserver/
+GEOSERVER_WEB_UI_LOCATION={siteurl}/geoserver/
+GEOSERVER_PUBLIC_LOCATION={siteurl}/geoserver/
 GEOSERVER_LOCATION=http://${GEOSERVER_LB_HOST_IP}:${GEOSERVER_LB_PORT}/geoserver/
 GEOSERVER_ADMIN_USER=admin
 GEOSERVER_ADMIN_PASSWORD={geoserverpwd}
diff --git a/create-envfile.py b/create-envfile.py
index e9f0e7fea0d..c910e912618 100644
--- a/create-envfile.py
+++ b/create-envfile.py
@@ -86,7 +86,6 @@ def _get_vals_to_replace(args):
         _vals_to_replace["https_host"] = _jsfile.get("hostname", args.hostname) if tcp == "https" else ""
 
         _vals_to_replace["siteurl"] = f"{tcp}://{_jsfile.get('hostname', args.hostname)}"
-        _vals_to_replace["geoserver_ui"] = f"{tcp}://{_jsfile.get('hostname', args.hostname)}"
         _vals_to_replace["secret_key"] = _jsfile.get("secret_key", args.secret_key) or "".join(
             random.choice(_strong_chars) for _ in range(50)
         )