diff --git a/guacamole/guacamole.secret.json b/guacamole/guacamole.secret.json
index 5b1dd25..6596f4c 100644
--- a/guacamole/guacamole.secret.json
+++ b/guacamole/guacamole.secret.json
@@ -1,19 +1,19 @@
 {
     "guacamolemysql": {
-        "MYSQL_DATABASE": "DB_MYSQL",
-        "MYSQL_USER": "DB_USER",
-        "MYSQL_PASSWORD": "DB_PASSWORD",
-        "MYSQL_ROOT_PASSWORD": "DB_ROOT_PASSWORD"
+        "MYSQL_DATABASE": "MYSQL_DATABASE",
+        "MYSQL_USER": "MYSQL_USER",
+        "MYSQL_PASSWORD": "MYSQL_PASSWORD",
+        "MYSQL_ROOT_PASSWORD": "MYSQL_ROOT_PASSWORD"
     },
     "guacamoletomcat": {
-        "ADMIN_NAME": "GUACAMOLE_ADMIN_NAME",
-        "ADMIN_PASSWORD": "GUACAMOLE_ADMIN_PASSWORD",
-        "MYSQL_DATABASE": "DB_MYSQL",
-        "MYSQL_USER": "DB_USER",
-        "MYSQL_PASSWORD": "DB_PASSWORD",
+        "ADMIN_NAME": "GUACAMOLE_USERNAME",
+        "ADMIN_PASSWORD": "GUACAMOLE_PASSWORD",
+        "MYSQL_DATABASE": "MYSQL_DATABASE",
+        "MYSQL_USER": "MYSQL_USER",
+        "MYSQL_PASSWORD": "MYSQL_PASSWORD",
         "MYSQL_HOSTNAME": "guacamolemysql-db",
         "GUACD_HOSTNAME": "guacd-app",
-        "TOTP_ENABLED": "TOTP_USE",
-        "BAN_ADDRESS_DURATION": "BAN_DURATION"
+        "TOTP_ENABLED": "GUACAMOLE_TOTP",
+        "BAN_ADDRESS_DURATION": "GUACAMOLE_BAN_DURATION"
     }
 }
\ No newline at end of file
diff --git a/guacamole/service-guacamole.json b/guacamole/service-guacamole.json
index 79b8a11..a01e3e8 100644
--- a/guacamole/service-guacamole.json
+++ b/guacamole/service-guacamole.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "guacamole",
-        "DOMAIN": "DOMAIN"
+        "DOMAIN": "#GUACAMOLE_DOMAIN"
     },
     "containers": [
         {