diff --git a/otc/backup-test-manu.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/backup-test-manu.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml
index d08ab74..3fee2b0 100644
--- a/otc/backup-test-manu.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml
+++ b/otc/backup-test-manu.t09.de/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://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04,ubuntu-latest:docker://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04
+              --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
           env:
             - name: RUNNER_NAME
               valueFrom:
diff --git a/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml
index 9ec1a4e..72499a3 100644
--- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml
+++ b/otc/edp.buildth.ing/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://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/catthehackerubuntu:act-22.04,ubuntu-latest:docker://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/catthehackerubuntu:act-22.04
+              --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
           env:
             - name: RUNNER_NAME
               valueFrom:
diff --git a/otc/forgejo-test.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/forgejo-test.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml
index f0c7679..6d53943 100644
--- a/otc/forgejo-test.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml
+++ b/otc/forgejo-test.t09.de/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://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04,ubuntu-latest:docker://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04
+              --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
           env:
             - name: RUNNER_NAME
               valueFrom:
diff --git a/otc/observability.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/observability.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml
index 422c4d2..033fa19 100644
--- a/otc/observability.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml
+++ b/otc/observability.buildth.ing/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://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04,ubuntu-latest:docker://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04
+              --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
           env:
             - name: RUNNER_NAME
               valueFrom:
diff --git a/otc/observability.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/observability.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml
index 46598ce..0cb19c9 100644
--- a/otc/observability.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml
+++ b/otc/observability.t09.de/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://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04,ubuntu-latest:docker://edp.buildth.ing/devfw-cicd/catthehackerubuntu:act-22.04
+              --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
           env:
             - name: RUNNER_NAME
               valueFrom: