diff --git a/template/stacks/forgejo/forgejo-runner/dind-docker.yaml b/template/stacks/forgejo/forgejo-runner/dind-docker.yaml
index d9b6cfb..67b05a9 100644
--- a/template/stacks/forgejo/forgejo-runner/dind-docker.yaml
+++ b/template/stacks/forgejo/forgejo-runner/dind-docker.yaml
@@ -39,7 +39,7 @@ spec:
               --token ${RUNNER_SECRET} \
               --name ${RUNNER_NAME} \
               --instance ${FORGEJO_INSTANCE_URL} \
-              --labels docker:docker://node:20-bookworm,ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04,ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+              --labels docker:docker://node:24-bookworm,ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04,ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-24.04,ubuntu-24.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04
           env:
             - name: RUNNER_NAME
               valueFrom:
@@ -58,7 +58,7 @@ spec:
       containers:
       - name: runner
         image: code.forgejo.org/forgejo/runner:6.4.0
-        command: 
+        command:
           - "sh"
           - "-c"
           - |
diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml
index 00dba3d..4de4004 100644
--- a/template/stacks/forgejo/forgejo-server/values.yaml
+++ b/template/stacks/forgejo/forgejo-server/values.yaml
@@ -188,15 +188,16 @@ image:
   fullOverride: {{{ getenv "CLIENT_REPO_DOMAIN" }}}/devfw-cicd/edp-forgejo:{{{ .Env.FORGEJO_IMAGE_TAG }}}
 
 forgejo:
-  runner:
-    enabled: true
-    image:
-      tag: latest
-    # replicas: 3
-    config:
-      runner:
-        labels:
-          - docker:docker://node:16-bullseye
-          - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04
-          - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04
-          - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+  # This appears to be governed by forgejo-runner, as intuition would suggest
+  # runner:
+  #   enabled: true
+  #   image:
+  #     tag: latest
+  #   # replicas: 3
+  #   config:
+  #     runner:
+  #       labels:
+  #         - docker:docker://node:16-bullseye
+  #         - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+  #         - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+  #         - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04