diff --git a/ENVDB.matest b/ENVDB.matest
index 86ada52..5453fa1 100644
--- a/ENVDB.matest
+++ b/ENVDB.matest
@@ -4,7 +4,7 @@ PGHOST=`kubectl get services traefik -n system -o jsonpath="{.status.loadBalance
 PGPASSWORD=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGPASSWORD}" | base64 --decode`
 PGUSER=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGUSER}" | base64 --decode`
 PGSSLMODE=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGSSLMODE}" | base64 --decode`
-PGDATABASE="matest"
+PGDATABASE="ma"
 export PGUSER PGHOST PGPASSWORD PGSSLMODE PGDATABASE
 
 MA_CONF=`cat config-test.json`
diff --git a/deployment/config.json b/deployment/config.json
index 6ee4598..268fc42 100644
--- a/deployment/config.json
+++ b/deployment/config.json
@@ -1,6 +1,7 @@
 {
   "mqtt": {
     "broker": "mqtt://emqx01-anonymous-cluster-internal.broker.svc.cluster.local:1883",
+    "username": "archiver",
     "tlsEnable": "false"
   },
   "includeTopics": [
diff --git a/deployment/deploy-yml.tmpl b/deployment/deploy-yml.tmpl
index 5bcd15b..d5cce4b 100644
--- a/deployment/deploy-yml.tmpl
+++ b/deployment/deploy-yml.tmpl
@@ -23,6 +23,8 @@ spec:
           envFrom:
             - secretRef: 
                 name: ma-db-cred
+            - secretRef: 
+                name: ma-mqtt-cred
             - configMapRef:
                 name: ma-conf
 
diff --git a/deployment/roll-db-credentials.sh b/deployment/roll-credentials.sh
similarity index 99%
rename from deployment/roll-db-credentials.sh
rename to deployment/roll-credentials.sh
index c03bd17..90e13cd 100755
--- a/deployment/roll-db-credentials.sh
+++ b/deployment/roll-credentials.sh
@@ -11,6 +11,7 @@ LOGIN=ma
 PASSWORD=`openssl rand -base64 24`
 NAMESPACE=`cat namespace`
 
+
 psql <<EOF
 do
 \$\$