diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index 42ee546..02885c6 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -34,13 +34,6 @@ jobs:
           name: executable-x86_64
           path: app/dist/wolServer
 
-      - name: Cleanup Docker Images (x86_64)
-        run: |
-          docker image prune -a -f
-          docker container prune -f
-          docker volume prune -f
-          docker network prune -f
-
   build-arm:
     runs-on: ubuntu-latest
 
@@ -105,13 +98,6 @@ jobs:
           name: executable-arm
           path: app/dist/wolServer
 
-      - name: Cleanup Docker Images (ARM)
-        run: |
-          docker image prune -a -f
-          docker container prune -f
-          docker volume prune -f
-          docker network prune -f
-
   release:
     needs: [build-x86_64, build-arm]
     runs-on: ubuntu-latest
@@ -188,3 +174,14 @@ jobs:
           else
             echo "ARM executable not found"
           fi
+
+  cleanup:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cleanup Buildx Containers
+        run: |
+          docker ps -q --filter "name=buildx" | xargs -r docker stop
+          docker ps -aq --filter "name=buildx" | xargs -r docker rm
+          docker images --filter "reference=buildx*" -q | xargs -r docker rmi
+          docker volume ls --filter "name=buildx" -q | xargs -r docker volume rm