diff --git a/apps/eclipse-mosquitto/data/scripts/dynsec-setup.sh b/apps/eclipse-mosquitto/data/scripts/dynsec-setup.sh
index cea56d77..1333a6fe 100644
--- a/apps/eclipse-mosquitto/data/scripts/dynsec-setup.sh
+++ b/apps/eclipse-mosquitto/data/scripts/dynsec-setup.sh
@@ -20,8 +20,8 @@ DEFAULT_DYNSEC_PASSWORD=securePassword
 DYNSEC_FILE_PATH=/mosquitto/config/dynamic-security.json
 
 # Set values if provided via Environment Variables in the Docker Init Container
-MQTT_DYNSEC_ADMIN_USER=${MQTT_DYNSEC_ADMIN_USER:-DEFAULT_DYNSEC_ADMIN}
-MQTT_DYNSEC_ADMIN_PASSWORD=${MQTT_DYNSEC_ADMIN_PASSWORD:-DEFAULT_DYNSEC_PASSWORD}
+MQTT_DYNSEC_ADMIN_USER=${MQTT_DYNSEC_ADMIN_USER:-$DEFAULT_DYNSEC_ADMIN}
+MQTT_DYNSEC_ADMIN_PASSWORD=${MQTT_DYNSEC_ADMIN_PASSWORD:-$DEFAULT_DYNSEC_PASSWORD}
 
 # echo "Admin/Pass: ${MQTT_DYNSEC_ADMIN_USER}/${MQTT_DYNSEC_ADMIN_PASSWORD}" ## DEBUG