diff --git a/pottwal.yml b/pottwal.yml
index 0494907..e856541 100644
--- a/pottwal.yml
+++ b/pottwal.yml
@@ -5,9 +5,6 @@
   vars:
     ansible_python_interpreter: /usr/bin/python3
 
-    mosquitto_image: eclipse-mosquitto:1.6
-    mosquitto_data: /srv/data/mosquitto
-
     openhab_image: openhab/openhab:2.5.11
     openhab_data: /srv/data/openhab
     openhab_host_port: 8081
@@ -82,39 +79,6 @@
         ports:
           - 3142:3142
 
-
-    - name: Ensure the mosquitto directories exist
-      file:
-        path: "{{ item }}"
-        state: directory
-      with_items:
-        - "{{ mosquitto_data }}/config"
-        - "{{ mosquitto_data }}/data"
-        - "{{ mosquitto_data }}/log"
-
-    - name: Make sure mosquitto config is there
-      template:
-        src: "templates/mosquitto.conf.j2"
-        dest: "{{ mosquitto_data }}/config/mosquitto.conf"
-      notify: restart_mosquitto
-
-    - name: Ensure mosquitto is running
-      docker_container:
-        name: mosquitto
-        image: "{{ mosquitto_image }}"
-        pull: true
-        state: started
-        ports:
-          - 1883:1883
-          - 9001:9001
-        volumes:
-          - "{{ mosquitto_data }}/config:/mosquitto/config"
-          - "{{ mosquitto_data }}/data:/mosquitto/data"
-          - "{{ mosquitto_data }}/log:/mosquitto/log"
-        detach: yes
-        keep_volumes: yes
-        restart_policy: unless-stopped
-
     - name: Ensure the openhab directories exist
       file:
         path: "{{ item }}"
@@ -219,8 +183,3 @@
         proxy_port: "{{ shlink_host_port }}"
 
   handlers:
-    - name: restart mosquitto
-      docker_container:
-        name: mosquitto
-        state: started
-        restart: yes
diff --git a/radon.yml b/radon.yml
index 29967b0..078499b 100644
--- a/radon.yml
+++ b/radon.yml
@@ -5,11 +5,50 @@
   vars:
     ansible_python_interpreter: /usr/bin/python3
 
+    mosquitto_image: eclipse-mosquitto:2.0.14
+    mosquitto_data: /srv/data/mosquitto
+
   roles:
     - role: docker_setup
       vars:
         docker_data_root: "/srv/docker"
 
   tasks:
+    - name: Ensure the mosquitto directories exist
+      file:
+        path: "{{ item }}"
+        state: directory
+      with_items:
+        - "{{ mosquitto_data }}/config"
+        - "{{ mosquitto_data }}/data"
+        - "{{ mosquitto_data }}/log"
+
+    - name: Make sure mosquitto config is there
+      template:
+        src: "templates/mosquitto.conf.j2"
+        dest: "{{ mosquitto_data }}/config/mosquitto.conf"
+      notify: restart mosquitto
+
+    - name: Ensure mosquitto is running
+      docker_container:
+        name: mosquitto
+        image: "{{ mosquitto_image }}"
+        pull: true
+        state: started
+        ports:
+          - 1883:1883
+          - 9001:9001
+        volumes:
+          - "{{ mosquitto_data }}/config:/mosquitto/config"
+          - "{{ mosquitto_data }}/data:/mosquitto/data"
+          - "{{ mosquitto_data }}/log:/mosquitto/log"
+        detach: yes
+        keep_volumes: yes
+        restart_policy: unless-stopped
 
   handlers:
+    - name: restart mosquitto
+      docker_container:
+        name: mosquitto
+        state: started
+        restart: yes
diff --git a/templates/mosquitto.conf.j2 b/templates/mosquitto.conf.j2
index 64c7575..c5ff401 100644
--- a/templates/mosquitto.conf.j2
+++ b/templates/mosquitto.conf.j2
@@ -5,10 +5,10 @@ persistence_location /mosquitto/data/
 log_dest file /mosquitto/log/mosquitto.log
 
 # Bridge to platon
-connection br-pottwal-to-platon
+connection br-radon-to-platon
 address platon:1883
 cleansession false
-clientid br-pottwal-platon
+clientid br-radon-platon
 start_type automatic
 notifications false
 try_private true