diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 6e1ce10..6312fa5 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -1,7 +1,7 @@
 on: [push]
 env:
   REGISTRY: forge.hornwitser.no
-  REGISTRY_IMAGE: forge.hornwitser.no/furnavia/builder
+  REGISTRY_IMAGE: forge.hornwitser.no/furnavia/builder:${{ github.ref_name }}
 
 jobs:
   build:
@@ -11,28 +11,16 @@ jobs:
         name: Install buildah
         run: |
           apk add buildah
-      -
-        name: Compute image tags
-        id: info
-        shell: bash
-        run: |
-          tee -a ${GITHUB_OUTPUT} <<EOF
-          TAGS=${{ env.REGISTRY_IMAGE }}:${{ github.ref_name }}
-          EOF
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        name: Build
-        run: |
-          id
-          $GITHUB_WORKSPACE/builder.sh ${{ steps.info.outputs.TAGS }}
       -
         name: Authenticate with registry
         run: |
           echo "${{ secrets.REGISTRY_TOKEN }}" | buildah login ${{ env.REGISTRY }} --username "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
       -
-        name: Push
-        with:
-          push: true
-          tags: ${{ steps.info.outputs.TAGS }}
+        name: Build and push
+        run: |
+          id
+          $GITHUB_WORKSPACE/builder.sh ${{ env.REGISTRY_IMAGE }}
+          buildah push ${{ env.REGISTRY_IMAGE }}
diff --git a/builder.sh b/builder.sh
index 21bccc2..dee69ef 100755
--- a/builder.sh
+++ b/builder.sh
@@ -34,13 +34,6 @@ buildah run $ctr -- corepack enable pnpm
 buildah run $ctr rm -rf /var/lib/apt/lists/*
 
 buildah commit --rm $ctr $1
-if [[ $2 ]]; do
-	builda tag "$@"
-fi
-
-for image in "$@"; do
-	buildah push $image
-done
 
 #	apt-get install -y --no-install-recommends \
 #		ca-certificates \