diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index a354e13..a95fb85 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -209,7 +209,11 @@ jobs:
           df -i /home/ci-service /tmp /var/tmp 2>/dev/null || df -i /tmp /var/tmp
 
       - name: Safe storage pruning
-        run: podman --remote system prune -f
+        run: |
+          # Stop and remove any running containers first
+          podman --remote ps -aq | xargs -r podman --remote rm -f 2>/dev/null || true
+          # Then prune system
+          podman --remote system prune -f
 
       - name: Build frontend container image
         run: |