diff --git a/common/docker_traefik/tasks/certificate.yml b/common/docker_traefik/tasks/certificate.yml
index 40a41d910ef6a80947382c5b1f047b940e750e73..599d43c64fab3d9228d0e0ffa672beca36b41d08 100644
--- a/common/docker_traefik/tasks/certificate.yml
+++ b/common/docker_traefik/tasks/certificate.yml
@@ -95,4 +95,4 @@
   copy:
     dest: "{{ basedir }}/cert.pem"
     content: "{{ ''.join(cert_chain.complete_chain) }}"
-
+  when: not cert_cert_stat_result.stat.exists
diff --git a/site.yml b/site.yml
index a683feab2977f684e3deb25f83697603818a3047..88dbe61d090f67a51c2ea9f5ae136ff822b2415f 100644
--- a/site.yml
+++ b/site.yml
@@ -298,7 +298,6 @@
 - hosts: hix
   remote_user: root
   roles:
-    - { role: common/borgbackup, tags: borgbackup }
     - { role: common/cronapt, tags: cronapt }
     - { role: common/docker, tags: docker }
     - { role: common/prometheus-node, tags: prometheus-node }
@@ -315,7 +314,14 @@
         domain_default: "ha.warpzone.remote", 
         selfSignedCN: "warpzone.remote",
         selfSignedDomain: "*.warpzone.remote"
-      }   
+      }
+    - { 
+        role: intern/docker_mqtt, tags: mqtt, 
+        servicename: mqtt,
+        basedir: /srv/mqtt, 
+        mqtt_port: 1883,
+        influxdb_port: 18086
+      }
     - { 
         role: intern/docker_grafana, tags: grafana, 
         servicename: grafana,
@@ -330,13 +336,6 @@
         domain: "ha.warpzone.remote",
         influxdb_port: 38086
       }
-    - { 
-        role: intern/docker_mqtt, tags: mqtt, 
-        servicename: mqtt,
-        basedir: /srv/mqtt, 
-        mqtt_port: 1883,
-        influxdb_port: 18086
-      }
     - { 
         role: intern/docker_tasmoadmin, tags: tasmoadmin, 
         servicename: tasmoadmin,