diff --git a/tasks/main.yml b/tasks/main.yml
index bd97a008..3808ee36 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,6 +25,8 @@
     - always
 
 - include: rabbitmq_pre_install.yml
+  tags:
+    - rabbitmq_server-install
 
 # The install process will be skipped if `rabbitmq_ignore_version_state=true`
 - include: rabbitmq_install.yml
@@ -46,11 +48,24 @@
   when: >
     rabbitmq_user_ssl_cert is not defined or
     rabbitmq_user_ssl_key is not defined
+  tags:
+    - rabbitmq_server-config
+
 - include: rabbitmq_ssl_user_provided.yml
+  tags:
+    - rabbitmq_server-config
 
 - include: rabbitmq_set_cookie.yml
+  tags:
+    - rabbitmq_server-config
+
 - include: rabbitmq_post_install.yml
+  tags:
+    - rabbitmq_server-config
+
 - include: rabbitmq_cluster.yml
+  tags:
+    - rabbitmq_server-config
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/tasks/rabbitmq_install.yml b/tasks/rabbitmq_install.yml
index 8f56b56d..33c32a2b 100644
--- a/tasks/rabbitmq_install.yml
+++ b/tasks/rabbitmq_install.yml
@@ -20,12 +20,14 @@
   when: ansible_pkg_mgr == 'apt'
   tags:
     - rabbitmq-apt-packages
+    - rabbitmq_server-install
 
 - include: install_yum.yml
   static: no
   when: ansible_pkg_mgr == 'yum'
   tags:
     - rabbitmq-yum-packages
+    - rabbitmq_server-install
 
 - name: Reload the systemd daemon
   command: "systemctl daemon-reload"
@@ -35,6 +37,7 @@
   tags:
     - rabbitmq-apt-packages
     - rabbitmq-yum-packages
+    - rabbitmq_server-install
 
 - name: Ensure there are no policy-rc files
   file:
@@ -43,5 +46,8 @@
   tags:
     - rabbitmq-upgrade
     - rabbitmq-policy-file
+    - rabbitmq_server-config
 
 - include: rabbitmq_started.yml
+  tags:
+    - rabbitmq_server-config