diff --git a/tasks/main.yml b/tasks/main.yml
index 0aa46da1..21ec5fc8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -35,7 +35,6 @@
 
 - include: cinder_post_install.yml
   tags:
-    - cinder-install
     - cinder-config
 
 - include: cinder_db_setup.yml
@@ -43,18 +42,18 @@
     - groups['cinder_all'] | length > 0
     - inventory_hostname == groups['cinder_all'][0]
   tags:
-    - cinder-install
+    - cinder-config
 
 - include: cinder_service_setup.yml
   when:
     - groups['cinder_all'] | length > 0
     - inventory_hostname == groups['cinder_all'][0]
   tags:
-    - cinder-install
+    - cinder-config
 
 - include: cinder_init_common.yml
   tags:
-    - cinder-install
+    - cinder-config
 
 - name: Flush handlers
   meta: flush_handlers
@@ -64,11 +63,11 @@
     - groups['cinder_volume'] | length > 0
     - inventory_hostname in groups['cinder_volume'][0]
   tags:
-    - cinder-install
+    - cinder-config
 
 - include: cinder_lvm_config.yml
   when:
     - inventory_hostname in groups['cinder_volume']
     - cinder_backend_lvm_inuse
   tags:
-    - cinder-install
+    - cinder-config