diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 2b0ca77..dcf625b 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -14,20 +14,13 @@ jobs:
       matrix:
         variant: [45]
 
-    runs-on: ubuntu-latest
-
-    container:
-      image: ${{ vars.OCI_REGISTRY }}/drath/ci-tools:v2.4.1
-      credentials:
-        username: gitea
-        password: ${{ secrets.OCI_PASSWD }}
-        
+    runs-on: bare-metal
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build
-        run: docker build --squash --provenance=false --sbom=false -t ${{ vars.OCI_REGISTRY }}/drath/dev-toolbx:${{ matrix.variant }} -f Containerfile .
+        run: buildah bud -t ${{ vars.OCI_REGISTRY }}/drath/dev-toolbx:${{ matrix.variant }} -f Containerfile .
 
       - name: Push
         run: |
@@ -40,5 +33,5 @@ jobs:
         run: |
           echo "${{ secrets.COSIGN_KEY }}" > cosign.key
           DIGEST=$(skopeo inspect --creds "gitea:${{ secrets.OCI_PASSWD }}" --format '{{.Digest}}' docker://${{ vars.OCI_REGISTRY }}/drath/dev-toolbx:${{ matrix.variant }})
-          cosign sign --yes --key cosign.key "${{ vars.OCI_REGISTRY }}/drath/dev-toolbx@${DIGEST}"
+          cosign sign --yes --new-bundle-format=false --key cosign.key "${{ vars.OCI_REGISTRY }}/drath/dev-toolbx@${DIGEST}"