diff --git a/cluster/apps/dev/forgejo-runner/runner.yaml b/cluster/apps/dev/forgejo-runner/runner.yaml
index 4a3647d..3ca9d01 100644
--- a/cluster/apps/dev/forgejo-runner/runner.yaml
+++ b/cluster/apps/dev/forgejo-runner/runner.yaml
@@ -60,9 +60,9 @@ spec:
                   name: forgejo-runner-token
                   key: token
             - name: GITEA_RUNNER_LABELS
-              value: docker
+              value: docker,cluster
             - name: GITEA_RUNNER_NAME
-              value: cluster-runner
+              value: cluster-$(ACTIONS_RUNNER_POD_NAME)
           
           volumeMounts:
             - mountPath: /home/runner/_work