diff --git a/ansible/roles/prechecks/tasks/package_checks.yml b/ansible/roles/prechecks/tasks/package_checks.yml
index c86b40aef481c2ce7ef7980230ff895e6e427df2..272f9cbed7d5a56667ee73331d2bfed8f4286d21 100644
--- a/ansible/roles/prechecks/tasks/package_checks.yml
+++ b/ansible/roles/prechecks/tasks/package_checks.yml
@@ -3,7 +3,9 @@
   command: "{{ ansible_facts.python.executable }} -c \"import docker; print(docker.__version__)\""
   register: result
   changed_when: false
-  when: inventory_hostname in groups['baremetal']
+  when:
+    - inventory_hostname in groups['baremetal']
+    - kolla_container_engine == 'docker'
   failed_when: result is failed or result.stdout is version(docker_py_version_min, '<')
 
 # NOTE(osmanlicilegi): ansible_version.full includes patch number that's useless
diff --git a/ansible/roles/swift/tasks/reconfigure.yml b/ansible/roles/swift/tasks/reconfigure.yml
index 745626c44d5787dcb3b1fb19b920bbfdf7afc78a..7b02b3c76cc5ff7645f494bf8481c70a446ee0ea 100644
--- a/ansible/roles/swift/tasks/reconfigure.yml
+++ b/ansible/roles/swift/tasks/reconfigure.yml
@@ -44,7 +44,7 @@
 
 - name: Check the configs
   become: true
-  command: "{{ kolla_container_engine }}exec -u root {{ item.name }} /usr/local/bin/kolla_set_configs --check"
+  command: "{{ kolla_container_engine }} exec -u root {{ item.name }} /usr/local/bin/kolla_set_configs --check"
   changed_when: false
   failed_when: false
   register: check_results