diff --git a/mosquitto/arm/data/DST_Root_CA_X3.pem b/mosquitto/arm/data/DST_Root_CA_X3.pem
new file mode 100644
index 0000000..b2e43c9
--- /dev/null
+++ b/mosquitto/arm/data/DST_Root_CA_X3.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
diff --git a/mosquitto/data/ca.crt b/mosquitto/arm/data/fullchain.pem
similarity index 100%
rename from mosquitto/data/ca.crt
rename to mosquitto/arm/data/fullchain.pem
diff --git a/mosquitto/arm/data/mosquitto.conf b/mosquitto/arm/data/mosquitto.conf
index 24b117a..1504640 100644
--- a/mosquitto/arm/data/mosquitto.conf
+++ b/mosquitto/arm/data/mosquitto.conf
@@ -1,14 +1,26 @@
-listener 8080
-protocol websockets
+#
+# Docs: https://mosquitto.org/man/mosquitto-conf-5.html
+#
+
+port 1883
 log_dest stdout
 allow_anonymous false
 password_file /etc/mosquitto/pwfile
 persistence true
 persistence_location /var/lib/mosquitto
 
-###### ENABLE TLS ######
-#port 8883
-#cafile /var/lib/mosquitto/ca.crt
-#certfile /var/lib/mosquitto/server.crt
-#keyfile /var/lib/mosquitto/server.key
+###### ENABLE WS ######
+#listener 8080
+#protocol websockets
+#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem
+#certfile /var/lib/mosquitto/fullchain.pem
+#keyfile /var/lib/mosquitto/privkey.pem
+#require_certificate false
+
+###### ENABLE TLS ######
+#listener 8883
+#protocol mqtt
+#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem
+#certfile /var/lib/mosquitto/fullchain.pem
+#keyfile /var/lib/mosquitto/privkey.pem
 #require_certificate false
diff --git a/mosquitto/data/server.crt b/mosquitto/arm/data/privkey.pem
similarity index 100%
rename from mosquitto/data/server.crt
rename to mosquitto/arm/data/privkey.pem
diff --git a/mosquitto/data/DST_Root_CA_X3.pem b/mosquitto/data/DST_Root_CA_X3.pem
new file mode 100644
index 0000000..b2e43c9
--- /dev/null
+++ b/mosquitto/data/DST_Root_CA_X3.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
diff --git a/mosquitto/data/server.key b/mosquitto/data/fullchain.pem
similarity index 100%
rename from mosquitto/data/server.key
rename to mosquitto/data/fullchain.pem
diff --git a/mosquitto/data/mosquitto.conf b/mosquitto/data/mosquitto.conf
index 6041bde..1504640 100644
--- a/mosquitto/data/mosquitto.conf
+++ b/mosquitto/data/mosquitto.conf
@@ -1,12 +1,26 @@
-port 8883
-listener 8080
-protocol websockets
+#
+# Docs: https://mosquitto.org/man/mosquitto-conf-5.html
+#
+
+port 1883
 log_dest stdout
 allow_anonymous false
 password_file /etc/mosquitto/pwfile
 persistence true
 persistence_location /var/lib/mosquitto
-cafile /var/lib/mosquitto/ca.crt
-certfile /var/lib/mosquitto/server.crt
-keyfile /var/lib/mosquitto/server.key
-require_certificate false
+
+###### ENABLE WS ######
+#listener 8080
+#protocol websockets
+#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem
+#certfile /var/lib/mosquitto/fullchain.pem
+#keyfile /var/lib/mosquitto/privkey.pem
+#require_certificate false
+
+###### ENABLE TLS ######
+#listener 8883
+#protocol mqtt
+#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem
+#certfile /var/lib/mosquitto/fullchain.pem
+#keyfile /var/lib/mosquitto/privkey.pem
+#require_certificate false
diff --git a/mosquitto/data/privkey.pem b/mosquitto/data/privkey.pem
new file mode 100644
index 0000000..e69de29