diff --git a/tripleo_ansible/ansible_plugins/filter/helpers.py b/tripleo_ansible/ansible_plugins/filter/helpers.py
index d054cc47d..1c79639a3 100644
--- a/tripleo_ansible/ansible_plugins/filter/helpers.py
+++ b/tripleo_ansible/ansible_plugins/filter/helpers.py
@@ -382,6 +382,7 @@ class FilterModule(object):
         failed = []
         for item in async_results:
             if item['failed'] or not item['finished']:
-                for k, v in item['container_data'].items():
+                async_result_item = item['create_async_result_item']
+                for k, v in async_result_item['container_data'].items():
                     failed.append(k)
         return failed
diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/create.yml b/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/create.yml
index 2b3292bff..2e3ef75f6 100644
--- a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/create.yml
+++ b/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/create.yml
@@ -92,9 +92,7 @@
   when:
     - not ansible_check_mode|bool
 
-# This fact will be used in systemd playbook to figure out if whether or not
-# a container managed by systemd needs to be restarted
-- name: "Create a list of containers which changed"
+- name: "Create facts for containers which changed or failed"
   set_fact:
     containers_changed: "{{ create_async_poll_results.results | get_changed_containers }}"
     containers_failed: "{{ create_async_poll_results.results | get_failed_containers }}"
diff --git a/tripleo_ansible/tests/plugins/filter/test_helpers.py b/tripleo_ansible/tests/plugins/filter/test_helpers.py
index 28b3871a2..427cc33af 100644
--- a/tripleo_ansible/tests/plugins/filter/test_helpers.py
+++ b/tripleo_ansible/tests/plugins/filter/test_helpers.py
@@ -807,9 +807,11 @@ class TestHelperFilters(tests_base.TestCase):
                 "ansible_job_id": "948704694230.17597",
                 "ansible_loop_var": "container_data",
                 "changed": True,
-                "container_data": {
-                    "haproxy": {
-                        "image": "haproxy:latest",
+                "create_async_result_item": {
+                    "container_data": {
+                        "haproxy": {
+                            "image": "haproxy:latest",
+                        }
                     }
                 },
                 "failed": False,
@@ -821,9 +823,11 @@ class TestHelperFilters(tests_base.TestCase):
                 "ansible_job_id": "948704694230.17597",
                 "ansible_loop_var": "container_data",
                 "changed": True,
-                "container_data": {
-                    "memcached": {
-                        "image": "memcached:latest",
+                "create_async_result_item": {
+                    "container_data": {
+                        "memcached": {
+                            "image": "memcached:latest",
+                        }
                     }
                 },
                 "failed": True,
@@ -835,9 +839,11 @@ class TestHelperFilters(tests_base.TestCase):
                 "ansible_job_id": "316140143697.17616",
                 "ansible_loop_var": "container_data",
                 "changed": True,
-                "container_data": {
-                    "mysql": {
-                        "image": "mysql:latest",
+                "create_async_result_item": {
+                    "container_data": {
+                        "mysql": {
+                            "image": "mysql:latest",
+                        }
                     }
                 },
                 "failed": False,