diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml
index f250d1f..609be89 100644
--- a/template/stacks/core/argocd.yaml
+++ b/template/stacks/core/argocd.yaml
@@ -18,7 +18,7 @@ spec:
     name: in-cluster
     namespace: argocd
   sources:
-    - repoURL: https://edp.buildth.ing/DevFW-CICD/argocd-helm.git
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/DevFW-CICD/argocd-helm.git
       path: charts/argo-cd
       # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged
       # As logout make problems, it is suggested to switch from path based routing to an own argocd domain,
diff --git a/template/stacks/forgejo/forgejo-runner/dind-docker.yaml b/template/stacks/forgejo/forgejo-runner/dind-docker.yaml
index bd9fac0..2702b3e 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://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://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
           env:
             - name: RUNNER_NAME
               valueFrom:
diff --git a/template/stacks/forgejo/forgejo-server.yaml b/template/stacks/forgejo/forgejo-server.yaml
index 515d55a..249976a 100644
--- a/template/stacks/forgejo/forgejo-server.yaml
+++ b/template/stacks/forgejo/forgejo-server.yaml
@@ -18,12 +18,12 @@ spec:
     name: in-cluster
     namespace: gitea
   sources:
-    - repoURL: https://edp.buildth.ing/DevFW-CICD/forgejo-helm.git
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/DevFW-CICD/forgejo-helm.git
       path: .
       # first check out the desired version (example v9.0.0): https://code.forgejo.org/forgejo-helm/forgejo-helm/src/tag/v9.0.0/Chart.yaml
       # (note that the chart version is not the same as the forgejo application version, which is specified in the above Chart.yaml file)
       # then use the devops pipeline and select development, forgejo and the desired version (example v9.0.0):
-      # https://edp.buildth.ing/DevFW-CICD/devops-pipelines/actions?workflow=update-helm-depends.yaml&actor=0&status=0
+      # https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/DevFW-CICD/devops-pipelines/actions?workflow=update-helm-depends.yaml&actor=0&status=0
       # finally update the desired version here and include "-depends", it is created by the devops pipeline. 
       # why do we have an added "-depends" tag? it resolves rate limitings when downloading helm OCI dependencies
       targetRevision: v12.0.0-depends
diff --git a/template/stacks/otc/ingress-nginx.yaml b/template/stacks/otc/ingress-nginx.yaml
index 27deea4..8414885 100644
--- a/template/stacks/otc/ingress-nginx.yaml
+++ b/template/stacks/otc/ingress-nginx.yaml
@@ -18,7 +18,7 @@ spec:
     name: in-cluster
     namespace: ingress-nginx
   sources:
-    - repoURL: https://edp.buildth.ing/DevFW-CICD/ingress-nginx-helm.git
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/DevFW-CICD/ingress-nginx-helm.git
       path: charts/ingress-nginx
       targetRevision: helm-chart-4.12.1-depends
       helm: