diff --git a/host-radon.yml b/host-radon.yml
index 1715caf..cc7f3e4 100644
--- a/host-radon.yml
+++ b/host-radon.yml
@@ -13,7 +13,7 @@
     nodered_image: nodered/node-red:3.0.1-1-18
     nodered_data: "{{ data_dir }}/nodered"
 
-    rabbitmq_image: bitnami/rabbitmq:3.12.7
+    rabbitmq_image: bitnami/rabbitmq:3.12.8
     rabbitmq_data: "{{ data_dir }}/rabbitmq"
 
     pwr_meter_pulse_gw_image: netz39/power-meter-pulse-gateway:0.3.0
@@ -120,10 +120,14 @@
       ansible.builtin.stat:
         path: "{{ rabbitmq_data }}"
       register: rabbitmq_dir
+      tags:
+        - rabbitmq
     - name: Fail if rabbitmq data dir does not exist
       ansible.builtin.fail:
         msg: "RabbitMQ data dir is missing, please restore from the backup!"
       when: not rabbitmq_dir.stat.exists
+      tags:
+        - rabbitmq
 
     - name: Ensure rabbitmq docker container is running
       docker_container:
@@ -143,6 +147,8 @@
           - "{{ rabbitmq_data }}/bitnami:/bitnami:rw"
           - "{{ rabbitmq_data }}/etc_rabbitmq:/etc/rabbitmq:rw"
         restart_policy: unless-stopped
+      tags:
+        - rabbitmq
 
     - name: Setup proxy site rabbitmq.n39.eu
       include_role:
@@ -150,7 +156,8 @@
       vars:
         site_name: "rabbitmq.n39.eu"
         proxy_port: 15672
-
+      tags:
+        - rabbitmq
 
     - name: Ensure Power Meter Pulse Gateway for 19i room is running
       docker_container: