diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index ba0343e..82f59af 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -218,9 +218,9 @@ jobs:
             echo "Found containers: $containers"
             for container in $containers; do
               echo "Attempting to remove container: $container"
-              # Try to stop first, then remove
-              podman --remote stop "$container" 2>/dev/null || true
-              podman --remote rm -f "$container" 2>/dev/null || echo "Warning: Could not remove container $container"
+              # Try to stop first with timeout, then remove
+              timeout 10s podman --remote stop "$container" 2>/dev/null || echo "Timeout or error stopping container $container"
+              timeout 5s podman --remote rm -f "$container" 2>/dev/null || echo "Warning: Could not remove container $container"
             done
           else
             echo "No containers found to remove"