diff --git a/tasks/gitea-runner-homelab.yml b/tasks/gitea-runner-homelab.yml
index f844f6d..6128cca 100644
--- a/tasks/gitea-runner-homelab.yml
+++ b/tasks/gitea-runner-homelab.yml
@@ -39,4 +39,4 @@
       GITEA_INSTANCE_URL: "https://git.comprofix.com"
       GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}"
       GITEA_RUNNER_NAME: "homelab-runner"
-      GITEA_RUNNER_LABELS: "homelab:docker://alpine:latest"
+      GITEA_RUNNER_LABELS: "homelab:docker://alpine:latest,alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:22-bookworm"
diff --git a/tasks/gitea.yml b/tasks/gitea.yml
index f6bb221..6aad4cb 100644
--- a/tasks/gitea.yml
+++ b/tasks/gitea.yml
@@ -94,7 +94,7 @@
       GITEA_INSTANCE_URL: "https://git.comprofix.com"
       GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}"
       GITEA_RUNNER_NAME: "gitea-runner"
-      GITEA_RUNNER_LABELS: "alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:16-bullseye,ubuntu-22.04:docker://node:16-bullseye,ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster"
+      GITEA_RUNNER_LABELS: "alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:22-bookworm"
 
 - name: Create directories
   file: