diff --git a/_skeleton_role_/molecule/default/molecule.yml b/_skeleton_role_/molecule/default/molecule.yml
index a92a446f3..dab8668b1 100644
--- a/_skeleton_role_/molecule/default/molecule.yml
+++ b/_skeleton_role_/molecule/default/molecule.yml
@@ -36,6 +36,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml
index f2b6c89ed..74b588300 100644
--- a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml
@@ -40,6 +40,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml
index bc68a55a0..a16f79a04 100644
--- a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml
@@ -58,6 +58,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml
index f2b6c89ed..74b588300 100644
--- a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml
@@ -40,6 +40,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml
index 7d0a7ce9e..0e71e42f7 100644
--- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml
@@ -78,6 +78,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml
index f2b6c89ed..74b588300 100644
--- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml
@@ -40,6 +40,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/default/molecule.yml
index 7409d6b75..6cb54be1c 100644
--- a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/default/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/molecule.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/molecule.yml
index 126f530e1..1f477651f 100644
--- a/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/molecule.yml
index 97e31714b..4b46f61e5 100644
--- a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/molecule.yml
@@ -37,7 +37,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/molecule.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/molecule.yml
index 97e31714b..4b46f61e5 100644
--- a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/molecule.yml
@@ -37,7 +37,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/molecule.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/molecule.yml
index 97e31714b..4b46f61e5 100644
--- a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/molecule.yml
@@ -37,7 +37,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-container-stop/molecule/default/molecule.yml
index 7409d6b75..6cb54be1c 100644
--- a/tripleo_ansible/roles/tripleo-container-stop/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-stop/molecule/default/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-container-tag/molecule/default/molecule.yml
index a51a6617e..4237a6801 100644
--- a/tripleo_ansible/roles/tripleo-container-tag/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-tag/molecule/default/molecule.yml
@@ -42,7 +42,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/molecule.yml
index 97e31714b..4b46f61e5 100644
--- a/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/molecule.yml
@@ -37,7 +37,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/molecule.yml b/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/molecule.yml
index 97e31714b..4b46f61e5 100644
--- a/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/molecule.yml
@@ -37,7 +37,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml b/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml
index f2b6c89ed..74b588300 100644
--- a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml
@@ -40,6 +40,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml
index f2b6c89ed..74b588300 100644
--- a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml
@@ -40,6 +40,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml b/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml
index f2b6c89ed..74b588300 100644
--- a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml
@@ -40,6 +40,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-firewall/molecule/default/molecule.yml
index 7409d6b75..6cb54be1c 100644
--- a/tripleo_ansible/roles/tripleo-firewall/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-firewall/molecule/default/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/molecule.yml b/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/molecule.yml
index be86f0915..30d2221de 100644
--- a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/molecule.yml b/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/molecule.yml
index 1efb58822..59a33a503 100644
--- a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/molecule.yml b/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/molecule.yml
index 44b7c269d..740a17587 100644
--- a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml
index f0bb5f67d..e655aeb45 100644
--- a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml
@@ -75,6 +75,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml
index ab5d54f23..20a3eb263 100644
--- a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml
@@ -58,6 +58,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml
index ab5d54f23..20a3eb263 100644
--- a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml
@@ -58,6 +58,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-kernel/molecule/default/molecule.yml
index 7409d6b75..6cb54be1c 100644
--- a/tripleo_ansible/roles/tripleo-kernel/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-kernel/molecule/default/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/extra/molecule.yml b/tripleo_ansible/roles/tripleo-kernel/molecule/extra/molecule.yml
index 8e1b08153..4cc9dd76c 100644
--- a/tripleo_ansible/roles/tripleo-kernel/molecule/extra/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-kernel/molecule/extra/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/molecule.yml b/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/molecule.yml
index 1354d5e6f..a2baee8d0 100644
--- a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/molecule.yml
@@ -42,7 +42,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/kernelargs.yml b/tripleo_ansible/roles/tripleo-kernel/tasks/kernelargs.yml
index ee053240f..24b104548 100644
--- a/tripleo_ansible/roles/tripleo-kernel/tasks/kernelargs.yml
+++ b/tripleo_ansible/roles/tripleo-kernel/tasks/kernelargs.yml
@@ -38,6 +38,7 @@
         reboot_required: true
   become: true
   when:
+    - cmdline.stdout_lines is defined
     - tripleo_kernel_args|string
     - tripleo_kernel_args not in cmdline.stdout_lines[0]
 
diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml b/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml
index 87245ad27..26f6f22ba 100644
--- a/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml
+++ b/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml
@@ -49,6 +49,7 @@
         - "{{ ifcfg_files.files }}"
   become: true
   when:
+    - os_net_ifcfg_files.matched is defined
     - os_net_ifcfg_files.matched == 0
 
 - name: Reboot debug message
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml
index 694685171..41d8f9b8a 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml
@@ -30,6 +30,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml
index 7e2a5fd03..297b030cd 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml
@@ -19,8 +19,8 @@
     cloud: "{{ tripleo_keystone_resources_cloud_name }}"
     name: "{{ tripleo_keystone_resources_domain }}"
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_domain_results
   loop: "{{ batched_tripleo_keystone_resources_domains }}"
   loop_control:
@@ -35,3 +35,5 @@
   register: tripleo_keystone_resources_domain_async_poll_results
   until: tripleo_keystone_resources_domain_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml
index 8a8d8892e..4f9191991 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml
@@ -23,8 +23,8 @@
     endpoint_interface: "{{ keystone_endpoint_type }}"
     region: "{{ tripleo_keystone_resources_data.value.region }}"
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_endpoint_results
   loop: "{{ batched_tripleo_keystone_resources_data }}"
   loop_control:
@@ -40,3 +40,5 @@
   register: tripleo_keystone_resources_endpoint_async_poll_results
   until: tripleo_keystone_resources_endpoint_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml
index d9a5e2243..17bf61710 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml
@@ -20,8 +20,8 @@
     name: "{{ tripleo_keystone_resources_project }}"
     domain_id: default
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_project_results
   loop: "{{ batched_tripleo_keystone_resources_projects }}"
   loop_control:
@@ -36,3 +36,5 @@
   register: tripleo_keystone_resources_project_async_poll_results
   until: tripleo_keystone_resources_project_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml
index eece946fa..4b4b9a4b2 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml
@@ -19,8 +19,8 @@
     cloud: "{{ tripleo_keystone_resources_cloud_name }}"
     name: "{{ tripleo_keystone_resources_role }}"
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_role_results
   loop: "{{ batched_tripleo_keystone_resources_roles }}"
   loop_control:
@@ -35,3 +35,5 @@
   register: tripleo_keystone_resources_role_async_poll_results
   until: tripleo_keystone_resources_role_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml
index 1f6c6925e..1c8211de9 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml
@@ -22,8 +22,8 @@
     service_type: "{{ tripleo_keystone_resources_data.value.service }}"
     description: "OpenStack {{ tripleo_keystone_resources_data.value.service | title() }} Service"
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_service_results
   loop: "{{ batched_tripleo_keystone_resources_data }}"
   loop_control:
@@ -39,3 +39,5 @@
   register: tripleo_keystone_resources_service_async_poll_results
   until: tripleo_keystone_resources_service_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml
index ea620f562..3695f7cd2 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml
@@ -25,8 +25,8 @@
       get_domain_id(all_domains=openstack_domains) | default(omit) }}
     role: "{{ batched_tripleo_keystone_resources_roles_data.key }}"
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_user_role_results
   loop: "{{ tripleo_keystone_resources_data_users }}"
   loop_control:
@@ -41,3 +41,5 @@
   register: tripleo_keystone_resources_user_role_async_poll_results
   until: tripleo_keystone_resources_user_role_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml
index 71f1e69cc..cbc63096e 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml
@@ -24,8 +24,8 @@
     email: "{{ lookup('dict', tripleo_keystone_resources_data).key }}@localhost"
     domain: "{{ lookup('dict', tripleo_keystone_resources_data).value.domain | default('default') }}"
     state: present
-  async: 60
-  poll: 0
+  async: "{{ (not ansible_check_mode | bool) | ternary('60', omit) }}"
+  poll: "{{ (not ansible_check_mode | bool) | ternary('0', omit) }}"
   register: tripleo_keystone_resources_user_results
   loop: "{{ batched_tripleo_keystone_resources_data }}"
   loop_control:
@@ -41,3 +41,5 @@
   register: tripleo_keystone_resources_user_async_poll_results
   until: tripleo_keystone_resources_user_async_poll_results.finished
   retries: 30
+  when:
+    - not ansible_check_mode|bool
diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-module-load/molecule/default/molecule.yml
index 4e21e8195..b4b6b53c9 100644
--- a/tripleo_ansible/roles/tripleo-module-load/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-module-load/molecule/default/molecule.yml
@@ -56,6 +56,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/molecule.yml
index 4e21e8195..b4b6b53c9 100644
--- a/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/molecule.yml
@@ -56,6 +56,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/molecule.yml b/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/molecule.yml
index 4e21e8195..b4b6b53c9 100644
--- a/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/molecule.yml
@@ -56,6 +56,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-podman/molecule/default/molecule.yml
index 7409d6b75..6cb54be1c 100644
--- a/tripleo_ansible/roles/tripleo-podman/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-podman/molecule/default/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/install/molecule.yml b/tripleo_ansible/roles/tripleo-podman/molecule/install/molecule.yml
index 34d1a7ff2..0d7dc3def 100644
--- a/tripleo_ansible/roles/tripleo-podman/molecule/install/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-podman/molecule/install/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/login/molecule.yml b/tripleo_ansible/roles/tripleo-podman/molecule/login/molecule.yml
index 19c52b54d..d46917b79 100644
--- a/tripleo_ansible/roles/tripleo-podman/molecule/login/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-podman/molecule/login/molecule.yml
@@ -43,7 +43,7 @@ scenario:
   test_sequence:
     - prepare
     - converge
-    - verify
+    - check
 
 lint:
   enabled: false
diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml
index 5337b40ab..ac59245fc 100644
--- a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml
+++ b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml
@@ -32,6 +32,7 @@
     - name: Delete cni0 interface
       command: ip link delete cni0
       when:
+        - cni0_interface.rc is defined
         - cni0_interface.rc == 0
 
     - name: Check if 87-podman-bridge.conflist exists
diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml
index c9d6d3896..9be7836d1 100644
--- a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml
@@ -55,6 +55,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml
index ab5d54f23..20a3eb263 100644
--- a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml
@@ -58,6 +58,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml
index ab5d54f23..20a3eb263 100644
--- a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml
@@ -58,6 +58,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy
 
diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml
index cd03aaa5c..2135de633 100644
--- a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml
@@ -50,6 +50,7 @@ scenario:
     - create
     - prepare
     - converge
+    - check
     - verify
     - destroy