diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 12e0e01..4305aa0 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -1,26 +1,16 @@
----
 when:
   event:
     - push
 
-matrix:
-  include:
-    - NAME: AMD
-      ARCH: amd64
-
 steps:
-  build:
-    image: zot.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
-    name: Build shoebill operator image
+  - name: Build and push a container image
+    image: gitea.badhouseplants.net/badhouseplants/container-builder:latest
+    environment:
+      REGISTRY_TOKEN:
+        from_secret: REG_SECRET
     privileged: true
     commands:
-      - |
-        if [[ "${CI_COMMIT_TAG}" ]]; then
-          export CUSTOM_TAG="${CI_COMMIT_TAG}";
-        fi
       - build-container
-    secrets:
-      - registry_token
     backend_options:
       kubernetes:
         resources:
@@ -28,9 +18,6 @@ steps:
             memory: 500Mi
             cpu: 200m
           limits:
-            memory: 1000Mi
-            cpu: 1000m
+            memory: 500Mi
         securityContext:
           privileged: true
-        nodeSelector:
-          kubernetes.io/arch: "${ARCH}"
diff --git a/Containerfile b/Containerfile
index 3e7fcf2..303ad0d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22
+FROM golang:1.26.2
 WORKDIR /app
 
 COPY go.mod ./