diff --git a/tasks/ceph_all.yml b/tasks/ceph_all.yml
index cb74f69..1c92238 100644
--- a/tasks/ceph_all.yml
+++ b/tasks/ceph_all.yml
@@ -38,7 +38,9 @@
   static: no
   when:
     - ceph_pkg_source != 'distro'
-  tags:     ceph-preinstall
+  tags:
+    - ceph-preinstall
+    - ceph-install
 
 - include:  ceph_install.yml
   tags:     ceph-install
@@ -60,4 +62,6 @@
 - include:  ceph_auth.yml
   static: no
   when: cephx | bool
-  tags:     ceph-auth
+  tags:
+   - ceph-auth
+   - ceph-config
diff --git a/tasks/main.yml b/tasks/main.yml
index 6e5a9e7..4196450 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,5 +29,6 @@
         and gnocchi_storage_driver is defined
         and gnocchi_storage_driver == 'ceph')
   tags:
-  - ceph-client
+    - ceph-client
+    - always