diff --git a/apps/forgejo/runner-deployment.yaml b/apps/forgejo/runner-deployment.yaml
index fb0a476..76e61fa 100644
--- a/apps/forgejo/runner-deployment.yaml
+++ b/apps/forgejo/runner-deployment.yaml
@@ -84,7 +84,7 @@ spec:
             fieldRef:
               fieldPath: spec.nodeName
         - name: FORGEJO_RUNNER_LABELS
-          value: "self-hosted:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest,linux:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest,ubuntu-latest:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest,ubuntu-22.04:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest,ubuntu-24.04:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest,debian-12:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest,docker-ready:docker://registry.nxtgauge.com/catthehacker-ubuntu:act-latest"
+          value: "self-hosted:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm,linux:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm,ubuntu-latest:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm,ubuntu-22.04:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm,ubuntu-24.04:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm,debian-12:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm,docker-ready:docker://ci.nxtgauge.com/admin/forgejo-runner-job:bookworm"
         resources:
           requests:
             cpu: 200m
diff --git a/apps/forgejo/runner-job-image.Dockerfile b/apps/forgejo/runner-job-image.Dockerfile
new file mode 100644
index 0000000..3384cf3
--- /dev/null
+++ b/apps/forgejo/runner-job-image.Dockerfile
@@ -0,0 +1,15 @@
+FROM ci.nxtgauge.com/admin/docker:27-dind
+
+RUN apk add --no-cache \
+    bash \
+    curl \
+    git \
+    jq \
+    nodejs \
+    npm \
+    openssh-client \
+    python3 \
+    py3-pip \
+    tar
+
+ENTRYPOINT []