diff --git a/CHANGES b/CHANGES
index 799099399..a6f07f97d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1640,3 +1640,6 @@
 * Fix Exoscale endpoints in restore UI
 * Reset the app icon when showing the configure UI
 
+[4.1.6]
+* Fix issue where CLOUDRON_APP_HOSTNAME was incorrectly set
+
diff --git a/src/docker.js b/src/docker.js
index 505763731..75f8efc36 100644
--- a/src/docker.js
+++ b/src/docker.js
@@ -187,7 +187,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
     let stdEnv = [
         'CLOUDRON=1',
         'CLOUDRON_PROXY_IP=172.18.0.1',
-        `CLOUDRON_APP_HOSTNAME=${name}`,
+        `CLOUDRON_APP_HOSTNAME=${app.id}`,
         `${envPrefix}WEBADMIN_ORIGIN=${config.adminOrigin()}`,
         `${envPrefix}API_ORIGIN=${config.adminOrigin()}`,
         `${envPrefix}APP_ORIGIN=https://${domain}`,