diff --git a/tasks/rabbitmq_install.yml b/tasks/rabbitmq_install.yml
index bc7f260d..fc2f533c 100644
--- a/tasks/rabbitmq_install.yml
+++ b/tasks/rabbitmq_install.yml
@@ -40,7 +40,3 @@
     - rabbitmq-upgrade
     - rabbitmq-policy-file
     - rabbitmq_server-config
-
-- include_tasks: rabbitmq_started.yml
-  tags:
-    - rabbitmq_server-config
diff --git a/tasks/rabbitmq_post_install.yml b/tasks/rabbitmq_post_install.yml
index c57d131a..d8f37acb 100644
--- a/tasks/rabbitmq_post_install.yml
+++ b/tasks/rabbitmq_post_install.yml
@@ -71,6 +71,9 @@
   tags:
     - rabbitmq-config
 
+- include_tasks: rabbitmq_restart.yml
+  when: rabbit_config is changed or rabbitmq_plugin is changed or cookie_set is changed
+
 - name: Apply rabbitmq policies
   rabbitmq_policy:
     node: "rabbit@{{ ansible_hostname }}"
@@ -85,7 +88,7 @@
     - rabbitmq-cluster
 
 - include_tasks: rabbitmq_restart.yml
-  when: rabbit_config is changed or rabbitmq_plugin is changed or rabbitmq_policy is changed
+  when: rabbitmq_policy is changed
 
 # This is being done because the rabbitctl command used by the module
 # is not very effective at returning proper status codes for failure
diff --git a/tasks/rabbitmq_set_cookie.yml b/tasks/rabbitmq_set_cookie.yml
index 0778fe7c..fede3ab7 100644
--- a/tasks/rabbitmq_set_cookie.yml
+++ b/tasks/rabbitmq_set_cookie.yml
@@ -21,12 +21,3 @@
     owner: rabbitmq
     group: rabbitmq
   register: cookie_set
-
-- include_tasks: rabbitmq_stopped.yml
-  when:
-    - cookie_set is changed
-
-- include_tasks: rabbitmq_started.yml
-  when:
-    - cookie_set is changed
-