diff --git a/tasks/main.yml b/tasks/main.yml
index dfc9f537..9201615d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -61,38 +61,39 @@
 
 - include: neutron_post_install.yml
   tags:
-    - neutron-install
     - neutron-config
 
 # neutron system services
 - include: neutron_init.yml
   tags:
-    - neutron-install
+    - neutron-config
 
 - include: calico_init.yml
   static: no
   when: neutron_plugin_type == 'ml2.calico'
   tags:
-    - neutron-install
+    - neutron-config
 
 - include: neutron_db_setup.yml
   when:
     - neutron_services['neutron-server']['group'] in group_names
     - inventory_hostname == groups[neutron_services['neutron-server']['group']][0]
   tags:
-    - neutron-install
+    - neutron-config
 
 - include: neutron_service_setup.yml
   when:
     - "'neutron_all' in group_names"
     - inventory_hostname == groups['neutron_all'][0]
   tags:
-    - neutron-install
+    - neutron-config
 
 - include: neutron_l3_ha.yml
   when:
     - neutron_services['neutron-l3-agent']['group'] in group_names
     - neutron_legacy_ha_tool_enabled | bool
+  tags:
+    - neutron-config
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/tasks/neutron_l3_ha.yml b/tasks/neutron_l3_ha.yml
index 708c8fb9..4d3885e0 100644
--- a/tasks/neutron_l3_ha.yml
+++ b/tasks/neutron_l3_ha.yml
@@ -23,6 +23,8 @@
     owner: "root"
     group: "root"
     mode: "0755"
+  tags:
+    - neutron-install
 
 - name: Convert the hostname to an int
   name2int: