diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 5bf6442..1211cd9 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -30,6 +30,7 @@ jobs:
     steps:
       - name: Prepare environment
         run: |
+          # Extrahiert die reine Domain/Host aus der Gitea-URL
           REGISTRY_HOST=$(echo "${{ github.server_url }}" | awk -F/ '{print $3}')
           OWNER_LOWER="${{ github.repository_owner }}"
           NAME_LOWER="${{ env.IMAGE_NAME }}"
@@ -51,11 +52,14 @@ jobs:
           fi
 
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Image Metadata
         id: metadata
-        uses: docker/metadata-action@v5.7.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -67,8 +71,8 @@ jobs:
           labels: |
             org.opencontainers.image.created={{date 'YYYY-MM-DDTHH:mm:ssZ'}}
             org.opencontainers.image.description=${{ env.IMAGE_DESC }}
-            org.opencontainers.image.documentation=${{ github.server_url }}/${{ github.repository }}//raw/commit/${{ github.sha }}/README.md
-            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}/src/commit/${{ github.sha }}/Containerfile
+            org.opencontainers.image.documentation=${{ github.server_url }}/${{ github.repository }}
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.url=${{ github.server_url }}/${{ github.repository }}
             org.opencontainers.image.vendor=${{ github.repository_owner }}
@@ -76,100 +80,48 @@ jobs:
             containers.bootc=1
             ostree.bootable=1
 
-      - name: Build and Push Image (Buildah unprivileged)
+      - name: Login to Gitea Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY_HOST }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY }}
+
+      - name: Build and Push Image (Docker Buildx)
+        uses: docker/build-push-action@v6
         id: build_image
-        run: |
-          # Metadaten in Dateien schreiben, damit sie im Tar-Stream landen
-          cat << 'EOF' > labels.txt
-          ${{ steps.metadata.outputs.labels }}
-          EOF
+        with:
+          context: .
+          file: ./Containerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
 
-          cat << 'EOF' > tags.txt
-          ${{ steps.metadata.outputs.tags }}
-          EOF
-
-          # Buildah-Container starten und Image im RAM-Dateisystem bauen
-          BUILD_OUTPUT=$(tar -cf - . | docker run -i --rm \
-            --cap-add=SYS_ADMIN \
-            --security-opt seccomp=unconfined \
-            --security-opt apparmor=unconfined \
-            --security-opt label=disable \
-            --tmpfs /var/lib/containers:exec \
-            --ulimit nofile=1048576:1048576 \
-            quay.io/buildah/stable:latest \
-            bash -c '
-              mkdir /src && tar -xf - -C /src
-
-              # Labels sauber in ein Bash-Array einlesen (verhindert Escaping-Fehler)
-              declare -a LABEL_ARGS
-              while IFS= read -r line || [ -n "$line" ]; do
-                [ -z "$line" ] && continue
-                LABEL_ARGS+=("--label" "$line")
-              done < /src/labels.txt
-
-              FIRST_TAG=$(head -n 1 /src/tags.txt)
-
-              # 1. Image mit den dynamischen OCI-Labels bauen
-              buildah --storage-driver=vfs --isolation=chroot bud \
-                "${LABEL_ARGS[@]}" \
-                -t "$FIRST_TAG" \
-                -f /src/Containerfile /src
-
-              # 2. Wenn kein PR, direkt aus Buildah in die Gitea-Registry pushen
-              if [ "${{ github.event_name }}" != "pull_request" ]; then
-                PUSH_OUT=$(buildah --storage-driver=vfs push --creds "${{ github.repository_owner }}:${{ secrets.REGISTRY }}" "$FIRST_TAG" "docker://$FIRST_TAG")
-                echo "$PUSH_OUT"
-
-                # Alle weiteren von metadata-action generierten Tags pushen
-                while IFS= read -r tag || [ -n "$tag" ]; do
-                  [ -z "$tag" ] && continue
-                  if [ "$tag" != "$FIRST_TAG" ]; then
-                    buildah --storage-driver=vfs tag "$FIRST_TAG" "$tag"
-                    buildah --storage-driver=vfs push --creds "${{ github.repository_owner }}:${{ secrets.REGISTRY }}" "$tag" "docker://$tag"
-                  fi
-                done < /src/tags.txt
-
-                # Den echten Image-Digest aus den Push-Logs für Cosign extrahieren
-                DIGEST=$(echo "$PUSH_OUT" | grep -oE "sha256:[a-f0-9]{64}" | tail -n 1)
-                echo "CONTAINER_DIGEST=${DIGEST}"
-              fi
-            ')
-
-          # Log-Ausgabe für das Gitea Actions UI
-          echo "$BUILD_OUTPUT"
-
-          # Digest an den Runner-Schritt übergeben, falls gepusht wurde
-          if [ "${{ github.event_name }}" != "pull_request" ]; then
-            IMAGE_DIGEST=$(echo "$BUILD_OUTPUT" | grep "CONTAINER_DIGEST=" | cut -d= -f2)
-            echo "digest=${IMAGE_DIGEST}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Install gettext (provides envsubst)
+      - name: Install envsubst dependencies
         if: github.event_name != 'pull_request' && env.IS_TEST_BUILD == 'false'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext
+          sudo apt-get update && sudo apt-get install -y gettext
 
-      - name: Install Cosign via official Action
+      - name: Install Cosign
         if: github.event_name != 'pull_request' && env.IS_TEST_BUILD == 'false'
         uses: sigstore/cosign-installer@v4.1.2
 
-      - name: Sign container image
+      - name: Sign container image (Pure Digest)
         if: github.event_name != 'pull_request' && env.IS_TEST_BUILD == 'false'
         env:
           COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
           COSIGN_PASSWORD: ""
         run: |
-          # 1. Cosign an der Gitea-Registry anmelden
-          cosign login "${{ env.REGISTRY_HOST }}" -u "${{ github.repository_owner }}" -p "${{ secrets.REGISTRY }}"
+          # Cosign an der Gitea-Registry anmelden
+          echo "${{ secrets.REGISTRY }}" | cosign login "${{ env.REGISTRY_HOST }}" -u "${{ github.repository_owner }}" --password-stdin
 
-          # 2. Den reinen Digest aus dem Buildah-Schritt holen
-          IMAGE_DIGEST="${{ steps.build_image.outputs.digest }}"
-          IMAGE_REF="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}@${IMAGE_DIGEST}"
+          # Den exakten Digest direkt aus dem Buildx-Output ziehen
+          DIGEST="${{ steps.build_image.outputs.digest }}"
+          IMAGE_REF="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}@${DIGEST}"
 
           echo "Signiere exklusiv via Digest: ${IMAGE_REF}"
-
-          # 3. Signierung ausführen
           cosign sign -y \
             --key env://COSIGN_PRIVATE_KEY \
             --use-signing-config=false \
@@ -177,3 +129,16 @@ jobs:
             --tlog-upload=false \
             --registry-referrers-mode=legacy \
             "${IMAGE_REF}"
+
+      - name: Post-Build Cleanup
+        if: always()
+        run: |
+          echo "Führe serverseitige Tiefenreinigung durch..."
+          
+          # 1. Löscht ungenutzte Zwischenschritte und temporäre Volumes
+          docker system prune -f --volumes
+          
+          # 2. Killt den BuildKit-Cache komplett (Verhindert das unbemerktes Zumüllen des VPS)
+          docker builder prune -af
+          
+          echo "VPS-Speicherplatz erfolgreich bereinigt!"
\ No newline at end of file