diff --git a/deployment/deploy-yml.tmpl b/deployment/deploy-yml.tmpl
index f1a9dbd..aa04cc6 100644
--- a/deployment/deploy-yml.tmpl
+++ b/deployment/deploy-yml.tmpl
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: udi-archive
+  name: %PRE%-udi-archive
 spec:
   accessModes:
     - ReadWriteOnce
@@ -13,11 +13,11 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: udi
+  name: %PRE%-udi
   labels:
     app: udi
   annotations:
-    secret.reloader.stakater.com/reload: "udi-conf,udi-db-cred,mqtt-password"
+    secret.reloader.stakater.com/reload: "%PRE%-udi-conf,%PRE%-udi-db-cred,%PRE%-mqtt-password"
 spec:
   replicas: 1
   selector:
@@ -33,16 +33,16 @@ spec:
           image: %IMAGE%
           envFrom:
             - secretRef: 
-                name: udi-db-cred
+                name: %PRE%-udi-db-cred
             - secretRef:
-                name: mqtt-password
+                name: %PRE%-mqtt-password
             - secretRef:
-                name: udi-conf
+                name: %PRE%-udi-conf
           volumeMounts:
             - mountPath: /archive
               name: udi-archive
       volumes:
         - name: udi-archive
           persistentVolumeClaim:
-            claimName: udi-archive
+            claimName: %PRE%-udi-archive
 
diff --git a/src/udi/config-iot-cluster.json b/deployment/instances/udi/default/config.json
similarity index 100%
rename from src/udi/config-iot-cluster.json
rename to deployment/instances/udi/default/config.json
diff --git a/src/udi/config/config.go b/src/udi/config/config.go
index 6a4ac6f..ef518b6 100644
--- a/src/udi/config/config.go
+++ b/src/udi/config/config.go
@@ -12,7 +12,6 @@ type ConfigT struct {
   Mqtt struct {
     Broker string `json:"broker"`
     Username string `json:"username"`
-    PasswordEnvVar string `json:"passwordEnvVar"`
     Password string
     TlsEnable string `json:"tlsEnable"`
   } `json:"mqtt"`
@@ -36,8 +35,6 @@ func LoadConfiguration() {
     log.Fatalf("Unable to parse configuration: %s", err)
   }
 
-  if Config.Mqtt.PasswordEnvVar != "" {
-    Config.Mqtt.Password = os.Getenv(Config.Mqtt.PasswordEnvVar)
-  }
+  Config.Mqtt.Password = os.Getenv("MQTT_PASSWORD")
 }