diff --git a/odoo_openupgrade_wizard/tools/tools_docker.py b/odoo_openupgrade_wizard/tools/tools_docker.py
index 3cf24f3..6d9363e 100644
--- a/odoo_openupgrade_wizard/tools/tools_docker.py
+++ b/odoo_openupgrade_wizard/tools/tools_docker.py
@@ -131,6 +131,9 @@ def kill_container(container_name):
             try:
                 container.stop()
                 container.wait()
-                container.remove()
+                if container.status != "removed":
+                    container.remove()
+                container.wait(condition="removed")
+
             except docker.errors.NotFound as err:
                 logger.debug(f"Cannot kill container {container.name}: {err}")
diff --git a/odoo_openupgrade_wizard/tools/tools_postgres.py b/odoo_openupgrade_wizard/tools/tools_postgres.py
index 6189308..3b48333 100644
--- a/odoo_openupgrade_wizard/tools/tools_postgres.py
+++ b/odoo_openupgrade_wizard/tools/tools_postgres.py
@@ -33,7 +33,9 @@ def get_postgres_container(ctx):
                 f"Found container {container_name} in a exited status."
                 " Removing it..."
             )
-            container.remove()
+            if container.status != "removed":
+                container.remove()
+            container.wait(condition="removed")
         else:
             return container