diff --git a/deploy.sh b/deploy.sh
index d12b167..d358b20 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -8,14 +8,10 @@ kubectl create namespace $NAMESPACE \
   kubectl -f - apply
 
 echo "Applying certificate ..."
-kubectl apply -f $DEPLOYMENT_DIR/certificate.yml -n $NAMESPACE
+kubectl apply -f certificate.yml -n $NAMESPACE
 
 echo "Applyiny configuration ..."
-kubectl create configmap mosquitto-broker-config
-  --from-file=mosquitto.conf=mosquitto.conf
-  --from-file=pwfile=pwfile
-  --namespace=$NAMESPACE
-  --dry-run=client -o yaml | kubectl apply -f - -n $NAMESPACE
+./update-config.sh
 
 echo "Waiting for certificate secret to be created..."
 kubectl wait --for=condition=Ready certificate/mosquitto-broker-cert -n $NAMESPACE --timeout=300s
diff --git a/deploy.yml b/deploy.yml
index 8b09577..b4f3160 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -40,7 +40,7 @@ spec:
             - name: mosquitto-broker-config
               mountPath: /mosquitto/config/
               readOnly: true
-            - name: mosquitto-broker-tls-config
+            - name: mosquitto-broker-cert
               mountPath: /mosquitto/config/ssl
               readOnly: true
       volumes:
@@ -52,9 +52,9 @@ spec:
                 path: mosquitto.conf
               - key: pwfile
                 path: pwfile
-        - name: mosquitto-broker-tls-conf
+        - name: mosquitto-broker-cert
           secret:
-            secretName: mosquitto-broker-tls-conf
+            secretName: mosquitto-broker-cert
             defaultMode: 0644
             items:
               - key: tls.crt
@@ -90,7 +90,7 @@ spec:
     app: mosquitto-broker
   ports:
     - name: mqtt-anon
-      port: 1884
+      port: 1883
       targetPort: 1884
       protocol: TCP
 ---
diff --git a/mosquitto.conf b/mosquitto.conf
index c7edb48..ea57e03 100644
--- a/mosquitto.conf
+++ b/mosquitto.conf
@@ -1,4 +1,4 @@
-pid_file /mosquitto/config/mosquitto.pid
+pid_file /tmp/mosquitto.pid
 log_dest stdout
 log_type all
 
diff --git a/pwfile b/pwfile
deleted file mode 100644
index e69de29..0000000