diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bd53430..7d352ab 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,7 +1,11 @@
-name: Build and Tag Docker Image
+name: Build image
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master
@@ -12,10 +16,9 @@ env:
   # github.repository as <account>/<repo>
   IMAGE: public/actions-runner
 
-
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: actions-runners-machete
     permissions:
       contents: read
       packages: write
@@ -24,37 +27,60 @@ jobs:
       id-token: write
 
     steps:
-    # Checkout the repository
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    # Extract the version from the Dockerfile
-    - name: Set version from Dockerfile
-      id: set-version
-      run: |
-        VERSION=$(grep -oP '^FROM ghcr.io/actions/actions-runner:\K[^\s]+' Dockerfile)
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
-
-    # Log into Docker (optional, only needed if pushing to a registry)
-    - name: Log in to GitHub Container Registry
-      run: echo "${{ secrets.FUGA_REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.FUGA_REGISTRY_USERNAME }} --password-stdin
-
-    # Build the Docker image
-    - name: Build Docker image
-      run: docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.VERSION }} .
-
-    # Push the Docker image
-    - name: Push Docker image
-      run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.VERSION }}
-
-    # Install Cosign (for signing)
-    - name: Install Cosign
-      run: |
-        curl -LO https://github.com/sigstore/cosign/releases/latest/download/cosign-linux-amd64
-        chmod +x cosign-linux-amd64
-        sudo mv cosign-linux-amd64 /usr/local/bin/cosign
-
-    # Sign the Docker image using GitHub OIDC
-    - name: Sign Docker image
-      run: |
-        cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.VERSION }}
\ No newline at end of file
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Extract the version from the Dockerfile
+      - name: Set version from Dockerfile
+        id: set-version
+        run: |
+          VERSION=$(grep -oP '^FROM ghcr.io/actions/actions-runner:\K[^\s]+' Dockerfile)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
+        with:
+          cosign-release: 'v2.2.4'
+
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.FUGA_REGISTRY_USERNAME }}
+          password: ${{ secrets.FUGA_REGISTRY_PASSWORD }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          context: .
+          push: true
+          tags: {{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.VERSION }}
+          cache-from: type=registry,ref={{ env.REGISTRY }}/${{ env.IMAGE }}:buildcache
+          cache-to: type=registry,ref={{ env.REGISTRY }}/${{ env.IMAGE }}:buildcache,mode=max,ignore-error=true
+
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+      - name: Sign the published Docker image
+        env:
+          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
+          TAGS: {{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.VERSION }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+        # This step uses the identity token to provision an ephemeral certificate
+        # against the sigstore community Fulcio instance.
+        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}