diff --git a/src/udi/config-level-berresheim-cluster.json b/deployment/instances/udi-berresheim/default/config.json
similarity index 100%
rename from src/udi/config-level-berresheim-cluster.json
rename to deployment/instances/udi-berresheim/default/config.json
diff --git a/deployment/load-config.sh b/deployment/load-config.sh
deleted file mode 100755
index dedb27b..0000000
--- a/deployment/load-config.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-FILE=$1
-if [ "$FILE" = "" ]; then
-  echo "give config file to load as first argument"
-  exit 1
-fi
-MQTT_PASSWORD=$2
-if [ "$MQTT_PASSWORD" = "" ]; then
-  echo "give mqtt password as second argument"
-  exit 1
-fi
-NAMESPACE=$3
-if [ "$NAMESPACE" = "" ]; then
-  echo "give namespace as third argument"
-  exit 1
-fi
-
-kubectl create secret generic udi-conf \
-  --from-literal=UDI_CONF="`cat $FILE`" \
-  -n $NAMESPACE \
-  --dry-run=client \
-  -o yaml \
-  --save-config | \
-kubectl apply -f -
-
-kubectl create secret generic mqtt-password \
-  --from-literal=MQTT_PASSWORD="$MQTT_PASSWORD" \
-  -n $NAMESPACE \
-  --dry-run=client \
-  -o yaml \
-  --save-config | \
-kubectl apply -f -
-
-. ~/Workspace/MyKubernetesEnv/ENVDB
-DATABASE="udi-$NAMESPACE"
-LOGIN="udi-$NAMESPACE"
-PASSWORD=`openssl rand -base64 24` 
-psql <<EOF
-ALTER USER "$LOGIN" WITH PASSWORD '$PASSWORD';
-GRANT ALL PRIVILEGES ON DATABASE "$DATABASE" TO "$LOGIN";
-COMMIT;
-EOF
-
-kubectl create secret generic udi-db-cred \
-  --dry-run=client \
-  -o yaml \
-  --save-config \
-  --from-literal=PGUSER="$LOGIN" \
-  --from-literal=PGHOST="timescaledb.database.svc.cluster.local" \
-  --from-literal=PGPASSWORD="$PASSWORD" \
-  --from-literal=PGSSLMODE="require" \
-  --from-literal=PGDATABASE="$DATABASE" | \
-kubectl apply -f - -n $NAMESPACE
-
diff --git a/deployment/secrets.enc b/deployment/secrets.enc
index 677797d..148953a 100644
--- a/deployment/secrets.enc
+++ b/deployment/secrets.enc
@@ -1,4 +1,7 @@
-U2FsdGVkX1+235sIaS3YkXthSjtLu/5ky8o0KGw4E0Bh2avnKV6Qg9XiKe5JnJOk
-IQcWgB9rwqg1oNFD1diaotk5AEGvejJawiUcsvHywx7U0XqGt7vhNdf3tp/Mjc0z
-BzbHykKfwnFzX3PACw78HJb+zk10DyDgEQ09o7wE6CZVCx5MXdbcZzrJ1a7a3edQ
-+FKkrwK5L/byPJk7lOmdOxC+Kq+uVGWRToUniABbYYaBDvtpXytan8BVZcKSjQQ/
+U2FsdGVkX18MnwKVJuGzBEYaQZ74xtcnsCE5MkWYg91pKG16suIW8scUjW14Bdxt
+Q4UfE5cMeGMOYP2Yj/HY7gXZeDMJlAh/2d09DhL17h44Gdi8q3TMLJTSEGxx83cT
+RyrbLIRwne8QDQipxzNRp2PdDrOwflxOCB1cdrhBg63OM7o37NIdYUIPtbsSl0td
+rdcDsPC6c214JKKl3FvZGKVgVWo3EUBj9QUwK0IqucI6UHy3D2PaJ8/H++M6gA3U
+u3qbPMCjqvjBFRnMxKrMVhfkHPxM3tLyF9+932Gj6DFlJZbZInDNAEf9mty7z5Zm
+u4WbzejtKqnnZznwAesrlV9DndEkr1QGJkXBmkfZ5gMrfZSaLlXadUklGoOjDZ+K
+Z2Z9wAgA8UjyMEYFO5ZrJ8t7FG6uMlZpILv8HshrGUY=