diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml
index 49940c11..75775176 100644
--- a/tasks/cinder_install_source.yml
+++ b/tasks/cinder_install_source.yml
@@ -42,6 +42,7 @@
     src: "{{ cinder_bin | dirname }}/etc/os-brick/rootwrap.d/os-brick.filters"
     dest: /etc/cinder/rootwrap.d/os-brick.filters
     state: link
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Copy cinder rootwrap filters
   command: >-
diff --git a/tasks/cinder_post_install.yml b/tasks/cinder_post_install.yml
index 1c72fbbd..c2a84d9b 100644
--- a/tasks/cinder_post_install.yml
+++ b/tasks/cinder_post_install.yml
@@ -103,6 +103,7 @@
   changed_when: false
   with_items: "{{ cinder_core_files }}"
   run_once: true
+  check_mode: false
 
 - name: Copy common config
   openstack.config_template.config_template:
diff --git a/tasks/main.yml b/tasks/main.yml
index 700f8226..62cd1f34 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -109,11 +109,17 @@
   tags:
     - cinder-config
 
-- import_tasks: cinder_cleanup_old_facts.yml
+- include_tasks: cinder_cleanup_old_facts.yml
+  args:
+    apply:
+      tags:
+        - cinder-config
   when:
+    - "'openstack_ansible' in ansible_local"
+    - "'cinder' in ansible_local['openstack_ansible']"
     - "'need_db_sync' in ansible_local['openstack_ansible']['cinder']"
   tags:
-    - cinder-config
+    - always
 
 - import_tasks: cinder_post_install.yml
   tags: