diff --git a/.woodpecker/build-almalinux9.yaml b/.woodpecker/build-almalinux9.yaml
index 31b5629..885264d 100644
--- a/.woodpecker/build-almalinux9.yaml
+++ b/.woodpecker/build-almalinux9.yaml
@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: build rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -21,6 +21,16 @@ steps:
             cpu: 2
 
   - name: show rpms
-    image: git.unkin.net/unkin/almalinux9-base:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
diff --git a/.woodpecker/build-fedora42.yaml b/.woodpecker/build-fedora42.yaml
index 04d37af..0a3f8fc 100644
--- a/.woodpecker/build-fedora42.yaml
+++ b/.woodpecker/build-fedora42.yaml
@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: build rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -21,6 +21,16 @@ steps:
             cpu: 2
 
   - name: show rpms
-    image: git.unkin.net/unkin/fedora42-base:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora42
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
diff --git a/.woodpecker/build-fedora43.yaml b/.woodpecker/build-fedora43.yaml
index 54154ad..bf85363 100644
--- a/.woodpecker/build-fedora43.yaml
+++ b/.woodpecker/build-fedora43.yaml
@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: build rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -21,6 +21,16 @@ steps:
             cpu: 2
 
   - name: show rpms
-    image: git.unkin.net/unkin/fedora43-base:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora43
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
diff --git a/.woodpecker/build-fedora44.yaml b/.woodpecker/build-fedora44.yaml
index b68ec3c..815bfcb 100644
--- a/.woodpecker/build-fedora44.yaml
+++ b/.woodpecker/build-fedora44.yaml
@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: build rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -21,6 +21,16 @@ steps:
             cpu: 2
 
   - name: show rpms
-    image: git.unkin.net/unkin/fedora44-base:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora44
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
diff --git a/.woodpecker/deploy-almalinux9.yaml b/.woodpecker/deploy-almalinux9.yaml
index 9b793e2..fcc028d 100644
--- a/.woodpecker/deploy-almalinux9.yaml
+++ b/.woodpecker/deploy-almalinux9.yaml
@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: build-rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -22,13 +22,23 @@ steps:
             cpu: 2
 
   - name: show-rpms
-    image: git.unkin.net/unkin/almalinux9-base:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
     depends_on: [build-rpms]
 
   - name: deploy-rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - |
         HOST="https://artifactapi.k8s.syd1.au.unkin.net"
diff --git a/.woodpecker/deploy-fedora42.yaml b/.woodpecker/deploy-fedora42.yaml
index fd9cafe..461af6d 100644
--- a/.woodpecker/deploy-fedora42.yaml
+++ b/.woodpecker/deploy-fedora42.yaml
@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: build-rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -22,13 +22,23 @@ steps:
             cpu: 2
 
   - name: show-rpms
-    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora42
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
     depends_on: [build-rpms]
 
   - name: deploy-rpms
-    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora42
     commands:
       - |
         HOST="https://artifactapi.k8s.syd1.au.unkin.net"
diff --git a/.woodpecker/deploy-fedora43.yaml b/.woodpecker/deploy-fedora43.yaml
index 67dce5b..bb46d46 100644
--- a/.woodpecker/deploy-fedora43.yaml
+++ b/.woodpecker/deploy-fedora43.yaml
@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: build-rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -22,13 +22,23 @@ steps:
             cpu: 2
 
   - name: show-rpms
-    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora43
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
     depends_on: [build-rpms]
 
   - name: deploy-rpms
-    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora43
     commands:
       - |
         HOST="https://artifactapi.k8s.syd1.au.unkin.net"
diff --git a/.woodpecker/deploy-fedora44.yaml b/.woodpecker/deploy-fedora44.yaml
index add269d..e875c8c 100644
--- a/.woodpecker/deploy-fedora44.yaml
+++ b/.woodpecker/deploy-fedora44.yaml
@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: build-rpms
-    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
@@ -22,13 +22,23 @@ steps:
             cpu: 2
 
   - name: show-rpms
-    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora44
     commands:
       - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
     depends_on: [build-rpms]
 
   - name: deploy-rpms
-    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora44
     commands:
       - |
         HOST="https://artifactapi.k8s.syd1.au.unkin.net"
diff --git a/.woodpecker/pre-commit.yaml b/.woodpecker/pre-commit.yaml
index bf6529f..85d3e39 100644
--- a/.woodpecker/pre-commit.yaml
+++ b/.woodpecker/pre-commit.yaml
@@ -3,7 +3,16 @@ when:
 
 steps:
   - name: pre-commit
-    image: git.unkin.net/unkin/almalinux9-base:latest
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
     commands:
-      - dnf install uv make -y
       - uvx pre-commit run --all-files
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
diff --git a/Dockerfile b/Dockerfile
index c064ab4..0cc71d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+ARG BASE_IMAGE=artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
 FROM ${BASE_IMAGE}
 
 # Create output directory for RPMs
diff --git a/rpms/act_runner/metadata.yaml b/rpms/act_runner/metadata.yaml
index 7115915..a76e22b 100644
--- a/rpms/act_runner/metadata.yaml
+++ b/rpms/act_runner/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://gitea.com/gitea/act_runner
 license: MIT
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/argocd/metadata.yaml b/rpms/argocd/metadata.yaml
index 7c0a7b9..472f0be 100644
--- a/rpms/argocd/metadata.yaml
+++ b/rpms/argocd/metadata.yaml
@@ -12,13 +12,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 3.5.3
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 3.5.3
diff --git a/rpms/bind_exporter/metadata.yaml b/rpms/bind_exporter/metadata.yaml
index bd65613..3558424 100644
--- a/rpms/bind_exporter/metadata.yaml
+++ b/rpms/bind_exporter/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/prometheus-community/bind_exporter
 license: Apache-2.0 license
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/boilerplate/metadata.yaml b/rpms/boilerplate/metadata.yaml
index af212ca..152cdea 100644
--- a/rpms/boilerplate/metadata.yaml
+++ b/rpms/boilerplate/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.15.0
diff --git a/rpms/claude-code/metadata.yaml b/rpms/claude-code/metadata.yaml
index ca03d59..8d6974a 100644
--- a/rpms/claude-code/metadata.yaml
+++ b/rpms/claude-code/metadata.yaml
@@ -7,7 +7,7 @@ homepage: https://claude.ai/code
 license: Proprietary
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   repository:
   - almalinux/el9
diff --git a/rpms/cmctl/metadata.yaml b/rpms/cmctl/metadata.yaml
index 990ced2..7dd18ad 100644
--- a/rpms/cmctl/metadata.yaml
+++ b/rpms/cmctl/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.6.1
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.6.1
diff --git a/rpms/cni-plugins/metadata.yaml b/rpms/cni-plugins/metadata.yaml
index 6e018fd..d4f1c3d 100644
--- a/rpms/cni-plugins/metadata.yaml
+++ b/rpms/cni-plugins/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.9.1
diff --git a/rpms/code-server/metadata.yaml b/rpms/code-server/metadata.yaml
index 0460da2..c2cfd8c 100644
--- a/rpms/code-server/metadata.yaml
+++ b/rpms/code-server/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 4.117.0
diff --git a/rpms/consul-cni/metadata.yaml b/rpms/consul-cni/metadata.yaml
index a91ac11..956fbd9 100644
--- a/rpms/consul-cni/metadata.yaml
+++ b/rpms/consul-cni/metadata.yaml
@@ -9,7 +9,7 @@ homepage: https://hashicorp.com
 license: Mozilla Public License, version 2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/consul/metadata.yaml b/rpms/consul/metadata.yaml
index 3d2ed3c..33e1ea4 100644
--- a/rpms/consul/metadata.yaml
+++ b/rpms/consul/metadata.yaml
@@ -11,13 +11,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.22.7
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.22.7
diff --git a/rpms/etcd/metadata.yaml b/rpms/etcd/metadata.yaml
index fd7cc0a..bad4f75 100644
--- a/rpms/etcd/metadata.yaml
+++ b/rpms/etcd/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 3.6.10
diff --git a/rpms/exportarr/metadata.yaml b/rpms/exportarr/metadata.yaml
index 1ad7e85..8f14e62 100644
--- a/rpms/exportarr/metadata.yaml
+++ b/rpms/exportarr/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.3.0
diff --git a/rpms/frr_exporter/metadata.yaml b/rpms/frr_exporter/metadata.yaml
index 254da9a..1476246 100644
--- a/rpms/frr_exporter/metadata.yaml
+++ b/rpms/frr_exporter/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.11.0
diff --git a/rpms/g10k/metadata.yaml b/rpms/g10k/metadata.yaml
index c8f099f..3767106 100644
--- a/rpms/g10k/metadata.yaml
+++ b/rpms/g10k/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/xorpaul/g10k
 license: Apache2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/git-delta/metadata.yaml b/rpms/git-delta/metadata.yaml
index b851b15..4b73695 100644
--- a/rpms/git-delta/metadata.yaml
+++ b/rpms/git-delta/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.19.2
diff --git a/rpms/go-cache-plugin/metadata.yaml b/rpms/go-cache-plugin/metadata.yaml
index dcfa2c5..a1a7433 100644
--- a/rpms/go-cache-plugin/metadata.yaml
+++ b/rpms/go-cache-plugin/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2026.7.22
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2026.7.22
diff --git a/rpms/hadolint/metadata.yaml b/rpms/hadolint/metadata.yaml
index 49b4a10..ed7b7a3 100644
--- a/rpms/hadolint/metadata.yaml
+++ b/rpms/hadolint/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.14.0
diff --git a/rpms/helm/metadata.yaml b/rpms/helm/metadata.yaml
index f495a9b..a0524f1 100644
--- a/rpms/helm/metadata.yaml
+++ b/rpms/helm/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 4.1.4
diff --git a/rpms/helmfile/metadata.yaml b/rpms/helmfile/metadata.yaml
index d926e46..786dad5 100644
--- a/rpms/helmfile/metadata.yaml
+++ b/rpms/helmfile/metadata.yaml
@@ -12,6 +12,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.4.4
diff --git a/rpms/incus/metadata.yaml b/rpms/incus/metadata.yaml
index 03e7fa6..e1f837d 100644
--- a/rpms/incus/metadata.yaml
+++ b/rpms/incus/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 6.23.0
diff --git a/rpms/jellyfin-ffmpeg-bin/metadata.yaml b/rpms/jellyfin-ffmpeg-bin/metadata.yaml
index 33dfae3..934fb80 100644
--- a/rpms/jellyfin-ffmpeg-bin/metadata.yaml
+++ b/rpms/jellyfin-ffmpeg-bin/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: false
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1.1
   version: 7.1.3
diff --git a/rpms/jsonnet-language-server/metadata.yaml b/rpms/jsonnet-language-server/metadata.yaml
index 21df94d..4557d96 100644
--- a/rpms/jsonnet-language-server/metadata.yaml
+++ b/rpms/jsonnet-language-server/metadata.yaml
@@ -9,7 +9,7 @@ homepage: https://github.com/grafana/jsonnet-language-server
 license: Apache-2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   repository:
   - almalinux/el9
diff --git a/rpms/jsonnet-lint/metadata.yaml b/rpms/jsonnet-lint/metadata.yaml
index 4df45af..7a86104 100644
--- a/rpms/jsonnet-lint/metadata.yaml
+++ b/rpms/jsonnet-lint/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/google/go-jsonnet
 license: Apache-2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   repository:
   - almalinux/el9
diff --git a/rpms/jsonnet/metadata.yaml b/rpms/jsonnet/metadata.yaml
index 635fefd..b4ff3e1 100644
--- a/rpms/jsonnet/metadata.yaml
+++ b/rpms/jsonnet/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/google/go-jsonnet
 license: Apache-2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   repository:
   - almalinux/el9
diff --git a/rpms/k8up/metadata.yaml b/rpms/k8up/metadata.yaml
index 369e12a..b88c533 100644
--- a/rpms/k8up/metadata.yaml
+++ b/rpms/k8up/metadata.yaml
@@ -11,13 +11,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.16.0
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.16.0
diff --git a/rpms/kubecolor/metadata.yaml b/rpms/kubecolor/metadata.yaml
index 5691b35..7b4b868 100644
--- a/rpms/kubecolor/metadata.yaml
+++ b/rpms/kubecolor/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.8.0
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.8.0
diff --git a/rpms/kubeconform/metadata.yaml b/rpms/kubeconform/metadata.yaml
index 18cee3d..b2ae493 100644
--- a/rpms/kubeconform/metadata.yaml
+++ b/rpms/kubeconform/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.7.0
diff --git a/rpms/kubectl-cnpg/metadata.yaml b/rpms/kubectl-cnpg/metadata.yaml
index 8fdec55..c643c84 100644
--- a/rpms/kubectl-cnpg/metadata.yaml
+++ b/rpms/kubectl-cnpg/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.30.1
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.30.1
diff --git a/rpms/kubectl-tree/metadata.yaml b/rpms/kubectl-tree/metadata.yaml
index 0c0eaaf..c6f22fd 100644
--- a/rpms/kubectl-tree/metadata.yaml
+++ b/rpms/kubectl-tree/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.6.0
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.6.0
diff --git a/rpms/kubectl-view-secret/metadata.yaml b/rpms/kubectl-view-secret/metadata.yaml
index 94b7ee9..b7cfcc8 100644
--- a/rpms/kubectl-view-secret/metadata.yaml
+++ b/rpms/kubectl-view-secret/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.16.0
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.16.0
diff --git a/rpms/kubectx/metadata.yaml b/rpms/kubectx/metadata.yaml
index 8d69fae..ace6767 100644
--- a/rpms/kubectx/metadata.yaml
+++ b/rpms/kubectx/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.11.0
diff --git a/rpms/kustomize/metadata.yaml b/rpms/kustomize/metadata.yaml
index 7acc32d..cf38adc 100644
--- a/rpms/kustomize/metadata.yaml
+++ b/rpms/kustomize/metadata.yaml
@@ -11,6 +11,6 @@ github_release_pattern: ^kustomize/v.*
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   version: 5.8.1
diff --git a/rpms/lazydocker/metadata.yaml b/rpms/lazydocker/metadata.yaml
index b602865..e08cc4e 100644
--- a/rpms/lazydocker/metadata.yaml
+++ b/rpms/lazydocker/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.25.2
diff --git a/rpms/libfoundationdb/metadata.yaml b/rpms/libfoundationdb/metadata.yaml
index 55bc4fc..27e944c 100644
--- a/rpms/libfoundationdb/metadata.yaml
+++ b/rpms/libfoundationdb/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/apple/foundationdb
 license: Apache-2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/neovim-glibc-2.17/metadata.yaml b/rpms/neovim-glibc-2.17/metadata.yaml
index 2662974..dc137d4 100644
--- a/rpms/neovim-glibc-2.17/metadata.yaml
+++ b/rpms/neovim-glibc-2.17/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.12.2
diff --git a/rpms/neovim/metadata.yaml b/rpms/neovim/metadata.yaml
index 262db14..f79ddae 100644
--- a/rpms/neovim/metadata.yaml
+++ b/rpms/neovim/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.12.2
diff --git a/rpms/nfpm/metadata.yaml b/rpms/nfpm/metadata.yaml
index b3873c5..9d02d44 100644
--- a/rpms/nfpm/metadata.yaml
+++ b/rpms/nfpm/metadata.yaml
@@ -11,13 +11,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.46.3
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.46.3
diff --git a/rpms/node_exporter/metadata.yaml b/rpms/node_exporter/metadata.yaml
index 6584a5d..26bb181 100644
--- a/rpms/node_exporter/metadata.yaml
+++ b/rpms/node_exporter/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.11.1
diff --git a/rpms/nomad-autoscaler/metadata.yaml b/rpms/nomad-autoscaler/metadata.yaml
index 8aa348e..d349150 100644
--- a/rpms/nomad-autoscaler/metadata.yaml
+++ b/rpms/nomad-autoscaler/metadata.yaml
@@ -12,6 +12,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.4.9
diff --git a/rpms/nomad/metadata.yaml b/rpms/nomad/metadata.yaml
index c87d14f..e38fcd9 100644
--- a/rpms/nomad/metadata.yaml
+++ b/rpms/nomad/metadata.yaml
@@ -9,7 +9,7 @@ homepage: https://www.nomadproject.io/
 license: BUSL-1.1
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/nzbget/metadata.yaml b/rpms/nzbget/metadata.yaml
index 97abcda..1beb80b 100644
--- a/rpms/nzbget/metadata.yaml
+++ b/rpms/nzbget/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: '26.2'
diff --git a/rpms/nzbget_exporter/metadata.yaml b/rpms/nzbget_exporter/metadata.yaml
index bc1960c..0a2fae7 100644
--- a/rpms/nzbget_exporter/metadata.yaml
+++ b/rpms/nzbget_exporter/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/frebib/nzbget-exporter
 license: MIT
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/openbao-plugin-secret-consul/metadata.yaml b/rpms/openbao-plugin-secret-consul/metadata.yaml
index a6dc6f3..25d0bb2 100644
--- a/rpms/openbao-plugin-secret-consul/metadata.yaml
+++ b/rpms/openbao-plugin-secret-consul/metadata.yaml
@@ -11,6 +11,6 @@ github_release_pattern: ^secrets-consul-v.*
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.1.0
diff --git a/rpms/openbao-plugin-secret-nomad/metadata.yaml b/rpms/openbao-plugin-secret-nomad/metadata.yaml
index 023b80a..0ea4089 100644
--- a/rpms/openbao-plugin-secret-nomad/metadata.yaml
+++ b/rpms/openbao-plugin-secret-nomad/metadata.yaml
@@ -11,6 +11,6 @@ github_release_pattern: ^secrets-nomad-v.*
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.1.5
diff --git a/rpms/openbao-plugins/metadata.yaml b/rpms/openbao-plugins/metadata.yaml
index 26d3233..f4b2515 100644
--- a/rpms/openbao-plugins/metadata.yaml
+++ b/rpms/openbao-plugins/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.0.0
diff --git a/rpms/packer/metadata.yaml b/rpms/packer/metadata.yaml
index dd21a4f..a6478c7 100644
--- a/rpms/packer/metadata.yaml
+++ b/rpms/packer/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.15.3
diff --git a/rpms/pgbouncer_exporter/metadata.yaml b/rpms/pgbouncer_exporter/metadata.yaml
index 81c78f9..81e47c9 100644
--- a/rpms/pgbouncer_exporter/metadata.yaml
+++ b/rpms/pgbouncer_exporter/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/prometheus-community/pgbouncer_exporter
 license: Apache-2.0 license
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   repository:
   - almalinux/el9
diff --git a/rpms/postgres_exporter/metadata.yaml b/rpms/postgres_exporter/metadata.yaml
index 8e2549c..8f0b0a8 100644
--- a/rpms/postgres_exporter/metadata.yaml
+++ b/rpms/postgres_exporter/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.19.1
diff --git a/rpms/puppet-initial/metadata.yaml b/rpms/puppet-initial/metadata.yaml
index 76a19a0..378ab37 100644
--- a/rpms/puppet-initial/metadata.yaml
+++ b/rpms/puppet-initial/metadata.yaml
@@ -7,7 +7,7 @@ maintainer: UNKIN
 license: MIT
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/puppetdb_exporter/metadata.yaml b/rpms/puppetdb_exporter/metadata.yaml
index a3cbf4e..b85a632 100644
--- a/rpms/puppetdb_exporter/metadata.yaml
+++ b/rpms/puppetdb_exporter/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/camptocamp/prometheus-puppetdb-exporter
 license: Apache 2.0 License
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/ruff/metadata.yaml b/rpms/ruff/metadata.yaml
index 38ea668..31a846c 100644
--- a/rpms/ruff/metadata.yaml
+++ b/rpms/ruff/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.15.12
diff --git a/rpms/sops/metadata.yaml b/rpms/sops/metadata.yaml
index c8fdb05..5a1f1bb 100644
--- a/rpms/sops/metadata.yaml
+++ b/rpms/sops/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 3.12.2
diff --git a/rpms/stalwart-cli/metadata.yaml b/rpms/stalwart-cli/metadata.yaml
index 67584cb..684d6a1 100644
--- a/rpms/stalwart-cli/metadata.yaml
+++ b/rpms/stalwart-cli/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.15.3
diff --git a/rpms/stalwart-foundationdb/metadata.yaml b/rpms/stalwart-foundationdb/metadata.yaml
index 5881979..0676810 100644
--- a/rpms/stalwart-foundationdb/metadata.yaml
+++ b/rpms/stalwart-foundationdb/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.16.3
diff --git a/rpms/stalwart/metadata.yaml b/rpms/stalwart/metadata.yaml
index 58b8530..9673f12 100644
--- a/rpms/stalwart/metadata.yaml
+++ b/rpms/stalwart/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.16.3
diff --git a/rpms/starship/metadata.yaml b/rpms/starship/metadata.yaml
index 5d93ae4..834f49e 100644
--- a/rpms/starship/metadata.yaml
+++ b/rpms/starship/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.25.1
diff --git a/rpms/stern/metadata.yaml b/rpms/stern/metadata.yaml
index 9619328..0eefa70 100644
--- a/rpms/stern/metadata.yaml
+++ b/rpms/stern/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.33.1
diff --git a/rpms/tea/metadata.yaml b/rpms/tea/metadata.yaml
index ba55816..27ac9f0 100644
--- a/rpms/tea/metadata.yaml
+++ b/rpms/tea/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.14.0
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.14.0
diff --git a/rpms/terraform/metadata.yaml b/rpms/terraform/metadata.yaml
index 9251512..3e4176a 100644
--- a/rpms/terraform/metadata.yaml
+++ b/rpms/terraform/metadata.yaml
@@ -13,6 +13,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.15.0
diff --git a/rpms/terragrunt/metadata.yaml b/rpms/terragrunt/metadata.yaml
index c3ea313..61994e1 100644
--- a/rpms/terragrunt/metadata.yaml
+++ b/rpms/terragrunt/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.0.3
diff --git a/rpms/tflint/metadata.yaml b/rpms/tflint/metadata.yaml
index e44ce7d..3999eab 100644
--- a/rpms/tflint/metadata.yaml
+++ b/rpms/tflint/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.62.0
diff --git a/rpms/unkin-ca-certificates/metadata.yaml b/rpms/unkin-ca-certificates/metadata.yaml
index ab1c21b..31fa16e 100644
--- a/rpms/unkin-ca-certificates/metadata.yaml
+++ b/rpms/unkin-ca-certificates/metadata.yaml
@@ -8,12 +8,12 @@ homepage: https://vault.query.consul:8200
 license: Apache-2.0
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
   version: 2026.10.2
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - fedora/42
diff --git a/rpms/unkin-undionly-kpxe/metadata.yaml b/rpms/unkin-undionly-kpxe/metadata.yaml
index dcc5c69..06932f1 100644
--- a/rpms/unkin-undionly-kpxe/metadata.yaml
+++ b/rpms/unkin-undionly-kpxe/metadata.yaml
@@ -8,7 +8,7 @@ homepage: https://github.com/ipxe/ipxe
 license: GPL-2.0 license
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/unrar/metadata.yaml b/rpms/unrar/metadata.yaml
index 7d4675c..ce4c64c 100644
--- a/rpms/unrar/metadata.yaml
+++ b/rpms/unrar/metadata.yaml
@@ -10,7 +10,7 @@ homepage: https://www.rarlab.com/
 license: Freeware (UNRAR 7.11 freeware Copyright (c) 1993-2025 Alexander Roshal)
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
diff --git a/rpms/uv/metadata.yaml b/rpms/uv/metadata.yaml
index 9846a4c..8fea103 100644
--- a/rpms/uv/metadata.yaml
+++ b/rpms/uv/metadata.yaml
@@ -10,13 +10,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.11.14
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.11.14
diff --git a/rpms/vals/metadata.yaml b/rpms/vals/metadata.yaml
index 18c3e95..1a11190 100644
--- a/rpms/vals/metadata.yaml
+++ b/rpms/vals/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.44.0
diff --git a/rpms/vault/metadata.yaml b/rpms/vault/metadata.yaml
index fa484d4..ed5d0ed 100644
--- a/rpms/vault/metadata.yaml
+++ b/rpms/vault/metadata.yaml
@@ -13,13 +13,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.0.0
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 2.0.0
diff --git a/rpms/victoria-logs/metadata.yaml b/rpms/victoria-logs/metadata.yaml
index 1d87d6c..814d8f0 100644
--- a/rpms/victoria-logs/metadata.yaml
+++ b/rpms/victoria-logs/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.50.0
diff --git a/rpms/vlutils/metadata.yaml b/rpms/vlutils/metadata.yaml
index 3a3513a..cf046b2 100644
--- a/rpms/vlutils/metadata.yaml
+++ b/rpms/vlutils/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.50.0
diff --git a/rpms/vmagent/metadata.yaml b/rpms/vmagent/metadata.yaml
index 9d2e3d1..5e2302e 100644
--- a/rpms/vmagent/metadata.yaml
+++ b/rpms/vmagent/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.142.0
diff --git a/rpms/vmalert/metadata.yaml b/rpms/vmalert/metadata.yaml
index 5763df9..3b06c61 100644
--- a/rpms/vmalert/metadata.yaml
+++ b/rpms/vmalert/metadata.yaml
@@ -10,6 +10,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.142.0
diff --git a/rpms/vminsert/metadata.yaml b/rpms/vminsert/metadata.yaml
index 7a753da..08b4778 100644
--- a/rpms/vminsert/metadata.yaml
+++ b/rpms/vminsert/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.142.0
diff --git a/rpms/vmselect/metadata.yaml b/rpms/vmselect/metadata.yaml
index 814ca4c..4725307 100644
--- a/rpms/vmselect/metadata.yaml
+++ b/rpms/vmselect/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.142.0
diff --git a/rpms/vmstorage/metadata.yaml b/rpms/vmstorage/metadata.yaml
index 72cfc68..d722a86 100644
--- a/rpms/vmstorage/metadata.yaml
+++ b/rpms/vmstorage/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.142.0
diff --git a/rpms/vmutils/metadata.yaml b/rpms/vmutils/metadata.yaml
index 10b654a..40592a2 100644
--- a/rpms/vmutils/metadata.yaml
+++ b/rpms/vmutils/metadata.yaml
@@ -11,6 +11,6 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 1.142.0
diff --git a/rpms/xh/metadata.yaml b/rpms/xh/metadata.yaml
index cb46104..5d2a74c 100644
--- a/rpms/xh/metadata.yaml
+++ b/rpms/xh/metadata.yaml
@@ -9,7 +9,7 @@ homepage: https://github.com/ducaale/xh
 license: MIT
 dist_tag: true
 builds:
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+- image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: '1'
   repository:
   - almalinux/el9
@@ -18,6 +18,6 @@ builds:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 0.25.3
diff --git a/rpms/yq/metadata.yaml b/rpms/yq/metadata.yaml
index 7e0f852..92509b2 100644
--- a/rpms/yq/metadata.yaml
+++ b/rpms/yq/metadata.yaml
@@ -11,13 +11,13 @@ dist_tag: true
 builds:
 - repository:
   - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 4.53.2
 - repository:
   - fedora/42
   - fedora/43
   - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9
   release: 1
   version: 4.53.2
diff --git a/tools/build b/tools/build
index e01216c..aa69165 100755
--- a/tools/build
+++ b/tools/build
@@ -752,7 +752,7 @@ def get_base_image_from_metadata(package_dir: Path, distro: str = "el/9") -> str
         Base image URL or default if not found
     """
     metadata_file = package_dir / "metadata.yaml"
-    default_image = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest"
+    default_image = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9"
 
     if not metadata_file.exists():
         return default_image
@@ -783,7 +783,7 @@ def build_package_docker(
     package_release: str,
     dist_dir: Path,
     repository: str,
-    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
+    base_image: str = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9",
     dry_run: bool = False
 ) -> bool:
     """
@@ -1065,7 +1065,7 @@ def build_package_buildah(
     package_release: str,
     dist_dir: Path,
     repository: str,
-    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
+    base_image: str = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9",
     dry_run: bool = False
 ) -> bool:
     """
@@ -1262,7 +1262,7 @@ class PackageInfo:
     release: str
     directory: Path
     distro: str = 'almalinux/el9'
-    base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest"
+    base_image: str = "artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9"
     arch: str = 'amd64'
 
     def __str__(self):