diff --git a/.gitea/workflows/actions.yaml b/.gitea/workflows/actions.yaml
index 6a7bed0..d754133 100644
--- a/.gitea/workflows/actions.yaml
+++ b/.gitea/workflows/actions.yaml
@@ -59,7 +59,7 @@ jobs:
       # volumes:
       #   - /data:/data
       #   - /output:/output
-    runs-on: dind-rootless
+    runs-on: dind
     # needs: [semrel_dryrun, linting]
     needs: semrel_dryrun
     steps:
@@ -68,25 +68,21 @@ jobs:
       - name: Install dependencies
         uses: addnab/docker-run-action@v3
         with:
-          registry: registry.k8s.io
-          image: scl-image-builder/cluster-node-image-builder-amd64:v0.1.29
+          image: registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.29
           # options: --user root
-          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }}
+          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} --rm
           run: |
             make deps-ova
       - name: Build node template
         uses: addnab/docker-run-action@v3
         with:
-          registry: registry.k8s.io
-          image: scl-image-builder/cluster-node-image-builder-amd64:v0.1.29
+          image: registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.29
           # options: --user root
-          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }}
+          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} --rm
           run: |
             make build-node-ova-vsphere-ubuntu-2204
         # env:
         #   PACKER_LOG: 1
-      - name: Docker cleanup
-        run: docker rm $(docker ps -l --format '{{.ID}}')
 
   # semrel:
   #   name: Semantic Release