diff --git a/tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_podman_container_rm.yml b/tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_podman_container_rm.yml
index d619d082c..953fb3f3e 100644
--- a/tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_podman_container_rm.yml
+++ b/tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_podman_container_rm.yml
@@ -78,15 +78,11 @@
   systemd:
     daemon_reload: true
 
-- name: "stat {{ container }} container"
-  command: "podman container exists {{ container }}"
-  failed_when: false
-  changed_when: false
-  register: stat_container
-
-- name: Stop and remove container
-  command: "podman container rm --force {{ container }}"
-  changed_when: true
-  when:
-    - stat_container.rc is defined
-    - stat_container.rc == 0
+- name: Stop and remove container if exists
+  podman_container:
+    name: "{{ container }}"
+    state: absent
+  register: result
+  until: result is success
+  retries: 5
+  delay: 10