diff --git a/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/manage.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/manage.yml
index 9515642cb..eb82ec59b 100644
--- a/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/manage.yml
+++ b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/manage.yml
@@ -16,6 +16,10 @@
 
 - name: Run containers execs asynchronously
   include_tasks: podman/exec.yml
+  when:
+    - ((batched_container_data | haskey(attribute='action', value='exec') | default([])) | length > 0)
 
 - name: Manage containers asynchronously
   include_tasks: podman/create.yml
+  when:
+    - ((batched_container_data | haskey(attribute='action', reverse=True) | default([])) | length > 0)