diff --git a/template/edfbuilder.yaml b/template/edfbuilder.yaml
index 6df3ecc..60d71ea 100644
--- a/template/edfbuilder.yaml
+++ b/template/edfbuilder.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: registry
-    repoURL: 'https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder'
+    repoURL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder'
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/core.yaml b/template/registry/core.yaml
index 3df606e..1dcd61d 100644
--- a/template/registry/core.yaml
+++ b/template/registry/core.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/core
-    repoURL: 'https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder'
+    repoURL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder'
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/monitoring.yaml b/template/registry/monitoring.yaml
index ada8339..c3622f8 100644
--- a/template/registry/monitoring.yaml
+++ b/template/registry/monitoring.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/monitoring
-    repoURL: 'https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder'
+    repoURL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder'
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/ref-implementation.yaml b/template/registry/ref-implementation.yaml
index e224fa2..3ed97c2 100644
--- a/template/registry/ref-implementation.yaml
+++ b/template/registry/ref-implementation.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/ref-implementation
-    repoURL: 'https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder'
+    repoURL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder'
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/second-cluster.yaml b/template/registry/second-cluster.yaml
index 5374b56..9d93dc8 100644
--- a/template/registry/second-cluster.yaml
+++ b/template/registry/second-cluster.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/second-cluster
-    repoURL: 'https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder'
+    repoURL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder'
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml
index a0ad845..7922c1c 100644
--- a/template/stacks/core/argocd.yaml
+++ b/template/stacks/core/argocd.yaml
@@ -24,6 +24,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/core/argocd/values.yaml
-    - repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/core/argocd/values.yaml b/template/stacks/core/argocd/values.yaml
index 34e472d..8df9df4 100644
--- a/template/stacks/core/argocd/values.yaml
+++ b/template/stacks/core/argocd/values.yaml
@@ -1,5 +1,5 @@
 global:
-  domain: {{ .Values.edfbuilderDomain }}
+  domain: {{ .Values.edfbuilderTargetDomain }}
 
 configs:
   params:
@@ -39,6 +39,6 @@ server:
     pathType: ImplementationSpecific
     extraTls:
       - hosts:
-        - {{ .Values.edfbuilderDomain }}
+        - {{ .Values.edfbuilderTargetDomain }}
         secretName: argocd-net-tls
 
diff --git a/template/stacks/core/crossplane-compositions.yaml b/template/stacks/core/crossplane-compositions.yaml
index 2f3bfd1..3b95580 100644
--- a/template/stacks/core/crossplane-compositions.yaml
+++ b/template/stacks/core/crossplane-compositions.yaml
@@ -19,7 +19,7 @@ spec:
     namespace: crossplane-system
   source:
     path: stacks/core/crossplane-compositions
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
     directory:
       recurse: true
diff --git a/template/stacks/core/crossplane-providers.yaml b/template/stacks/core/crossplane-providers.yaml
index 5a04a37..2606887 100644
--- a/template/stacks/core/crossplane-providers.yaml
+++ b/template/stacks/core/crossplane-providers.yaml
@@ -19,5 +19,5 @@ spec:
     namespace: crossplane-system
   source:
     path: stacks/core/crossplane-providers
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
diff --git a/template/stacks/core/forgejo-runner.yaml b/template/stacks/core/forgejo-runner.yaml
index 55ead9b..78b7125 100644
--- a/template/stacks/core/forgejo-runner.yaml
+++ b/template/stacks/core/forgejo-runner.yaml
@@ -18,12 +18,12 @@ spec:
     name: in-cluster
     namespace: gitea
   sources:
-    - repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
       path: forgejo-runner
       targetRevision: HEAD
       helm:
         valueFiles:
           - $values/stacks/core/forgejo-runner/values.yaml
-    - repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml
index 9ea07d1..78231a0 100644
--- a/template/stacks/core/forgejo.yaml
+++ b/template/stacks/core/forgejo.yaml
@@ -24,6 +24,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/core/forgejo/values.yaml
-    - repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/core/forgejo/values.yaml b/template/stacks/core/forgejo/values.yaml
index 6081cbe..210f6ca 100644
--- a/template/stacks/core/forgejo/values.yaml
+++ b/template/stacks/core/forgejo/values.yaml
@@ -25,8 +25,8 @@ gitea:
     queue:
       TYPE: level
     server:
-      DOMAIN: 'gitea.{{ .Values.edfbuilderDomain }}'
-      ROOT_URL: 'https://gitea.{{ .Values.edfbuilderDomain }}:443'
+      DOMAIN: 'gitea.{{ .Values.edfbuilderTargetDomain }}'
+      ROOT_URL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}:443'
 
 service:
   ssh:
@@ -42,13 +42,13 @@ ingress:
     nginx.ingress.kubernetes.io/proxy-body-size: 512m
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
   hosts:
-    - host: gitea.{{ .Values.edfbuilderDomain }}
+    - host: gitea.{{ .Values.edfbuilderTargetDomain }}
       paths:
       - path: /
         pathType: Prefix
   tls:
     - hosts:
-      - gitea.{{ .Values.edfbuilderDomain }}
+      - gitea.{{ .Values.edfbuilderTargetDomain }}
       secretName: forgejo-net-tls
 
 image:
diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/core/ingress-nginx.yaml
index 5976152..b076be4 100644
--- a/template/stacks/core/ingress-nginx.yaml
+++ b/template/stacks/core/ingress-nginx.yaml
@@ -24,6 +24,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/core/ingress-nginx/values.yaml
-    - repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/monitoring/kube-prometheus.yaml b/template/stacks/monitoring/kube-prometheus.yaml
index 019fc0b..c0d1347 100644
--- a/template/stacks/monitoring/kube-prometheus.yaml
+++ b/template/stacks/monitoring/kube-prometheus.yaml
@@ -25,6 +25,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/monitoring/kube-prometheus/values.yaml
-    - repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
       targetRevision: HEAD
       ref: values
\ No newline at end of file
diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml
index da31e09..d4f21b9 100644
--- a/template/stacks/monitoring/kube-prometheus/values.yaml
+++ b/template/stacks/monitoring/kube-prometheus/values.yaml
@@ -8,7 +8,7 @@ grafana:
 
   grafana.ini:
     server:
-      domain: {{ .Values.edfbuilderDomain }}
+      domain: {{ .Values.edfbuilderTargetDomain }}
       root_url: "%(protocol)s://%(domain)s/grafana"
       serve_from_sub_path: true
 
@@ -16,5 +16,5 @@ grafana:
     enabled: true
     ingressClassName: nginx
     hosts:
-      - {{ .Values.edfbuilderDomain }}    
+      - {{ .Values.edfbuilderTargetDomain }}    
     path: /grafana           
\ No newline at end of file
diff --git a/template/stacks/ref-implementation/README.md b/template/stacks/ref-implementation/README.md
index 1ed4cb0..acb945b 100644
--- a/template/stacks/ref-implementation/README.md
+++ b/template/stacks/ref-implementation/README.md
@@ -30,7 +30,7 @@ idpbuilder create --use-path-routing \
   --package https://github.com/cnoe-io/stacks//ref-implementation
 ```
 
-This will take ~6 minutes for everything to come up. To track the progress, you can go to the [ArgoCD UI](https://{{ .Values.edfbuilderDomain }}:8443/argocd/applications).
+This will take ~6 minutes for everything to come up. To track the progress, you can go to the [ArgoCD UI](https://{{ .Values.edfbuilderTargetDomain }}:8443/argocd/applications).
 
 ### What was installed?
 
@@ -47,15 +47,15 @@ The only package that cannot be removed this way is Keycloak because other packa
 
 
 #### Accessing UIs
-- Argo CD: https://{{ .Values.edfbuilderDomain }}:8443/argocd
-- Argo Workflows: https://{{ .Values.edfbuilderDomain }}:8443/argo-workflows
-- Backstage: https://{{ .Values.edfbuilderDomain }}:8443/
-- Gitea: https://{{ .Values.edfbuilderDomain }}:8443/gitea
-- Keycloak: https://{{ .Values.edfbuilderDomain }}:8443/keycloak/admin/master/console/
+- Argo CD: https://{{ .Values.edfbuilderTargetDomain }}:8443/argocd
+- Argo Workflows: https://{{ .Values.edfbuilderTargetDomain }}:8443/argo-workflows
+- Backstage: https://{{ .Values.edfbuilderTargetDomain }}:8443/
+- Gitea: https://{{ .Values.edfbuilderTargetDomain }}:8443/gitea
+- Keycloak: https://{{ .Values.edfbuilderTargetDomain }}:8443/keycloak/admin/master/console/
 
 # Using it
 
-For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://{{ .Values.edfbuilderDomain }}:8443).
+For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://{{ .Values.edfbuilderTargetDomain }}:8443).
 
 Click on the Sign-In button, you will be asked to log into the Keycloak instance. There are two users set up in this 
 configuration, and their password can be retrieved with the following command:
@@ -70,7 +70,7 @@ Both users use the same password retrieved above.
 
 If you want to create a new user or change existing users:
 
-1. Go to the [Keycloak UI](https://{{ .Values.edfbuilderDomain }}:8443/keycloak/admin/master/console/). 
+1. Go to the [Keycloak UI](https://{{ .Values.edfbuilderTargetDomain }}:8443/keycloak/admin/master/console/). 
 Login with the username `cnoe-admin`. Password is the `KEYCLOAK_ADMIN_PASSWORD` field from the command above. 
 2. Select `cnoe` from the realms drop down menu.
 3. Select users tab.
@@ -97,9 +97,9 @@ You can click on the ArgoCD Application name to see more details.
 
 ### What just happened?
 
-1. Backstage created [a git repository](https://{{ .Values.edfbuilderDomain }}:8443/gitea/giteaAdmin/demo), then pushed templated contents to it.
-2. Backstage created [an ArgoCD Application](https://{{ .Values.edfbuilderDomain }}:8443/argocd/applications/argocd/demo?) and pointed it to the git repository.
-3. Backstage registered the application as [a component](https://{{ .Values.edfbuilderDomain }}:8443/gitea/giteaAdmin/demo/src/branch/main/catalog-info.yaml) in Backstage.
+1. Backstage created [a git repository](https://{{ .Values.edfbuilderTargetDomain }}:8443/gitea/giteaAdmin/demo), then pushed templated contents to it.
+2. Backstage created [an ArgoCD Application](https://{{ .Values.edfbuilderTargetDomain }}:8443/argocd/applications/argocd/demo?) and pointed it to the git repository.
+3. Backstage registered the application as [a component](https://{{ .Values.edfbuilderTargetDomain }}:8443/gitea/giteaAdmin/demo/src/branch/main/catalog-info.yaml) in Backstage.
 4. ArgoCD deployed the manifests stored in the repo to the cluster.
 5. Backstage retrieved application health from ArgoCD API, then displayed it.
 
diff --git a/template/stacks/ref-implementation/argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows.yaml
index 6cf4e93..a5794b0 100644
--- a/template/stacks/ref-implementation/argo-workflows.yaml
+++ b/template/stacks/ref-implementation/argo-workflows.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
     path: "stacks/ref-implementation/argo-workflows/manifests/dev"
   destination:
diff --git a/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml b/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml
index 5c97655..ea8c75f 100644
--- a/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml
+++ b/template/stacks/ref-implementation/argo-workflows/manifests/dev/ingress.yaml
@@ -19,7 +19,7 @@ spec:
                 name: argo-server
                 port:
                   name: web
-    - host: {{ .Values.edfbuilderDomain }}
+    - host: {{ .Values.edfbuilderTargetDomain }}
       http:
         paths:
           - path: /argo-workflows(/|$)(.*)
diff --git a/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml
index 35cce00..29bb00b 100644
--- a/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml
+++ b/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml
@@ -7,14 +7,14 @@ data:
   config: |
     sso:
       insecureSkipVerify: true 
-      issuer: https://{{ .Values.edfbuilderDomain }}/keycloak/realms/cnoe
+      issuer: https://{{ .Values.edfbuilderTargetDomain }}/keycloak/realms/cnoe
       clientId:
         name: keycloak-oidc
         key: client-id
       clientSecret:
         name: keycloak-oidc
         key: secret-key
-      redirectUrl: https://{{ .Values.edfbuilderDomain }}:443/argo-workflows/oauth2/callback
+      redirectUrl: https://{{ .Values.edfbuilderTargetDomain }}:443/argo-workflows/oauth2/callback
       rbac:
         enabled: true
       scopes:
diff --git a/template/stacks/ref-implementation/backstage-templates.yaml b/template/stacks/ref-implementation/backstage-templates.yaml
index 923f183..8083351 100644
--- a/template/stacks/ref-implementation/backstage-templates.yaml
+++ b/template/stacks/ref-implementation/backstage-templates.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
     path: "stacks/ref-implementation/backstage-templates/entities"
     directory:
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
index 09d8599..3cbbf60 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
@@ -20,7 +20,7 @@ metadata:
     backstage.io/kubernetes-namespace: default
     argocd/app-name: ${{values.name | dump}}
   links:
-    - url: https://gitea.{{ .Values.edfbuilderDomain }}:443
+    - url: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443
       title: Repo URL
       icon: github
 spec:
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
index 6fd9fab..7c042f5 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
@@ -100,7 +100,7 @@ spec:
       input:
         description: This is an example app
         # Hard coded value for this demo purposes only.
-        repoUrl: gitea.{{ .Values.edfbuilderDomain }}:443/?repo=${{parameters.name}}
+        repoUrl: gitea.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}}
         defaultBranch: main
     - id: create-argocd-app
       name: Create ArgoCD App
@@ -111,7 +111,7 @@ spec:
         argoInstance: in-cluster
         projectName: default
         # necessary until we generate our own cert
-        repoUrl: https://gitea.{{ .Values.edfbuilderDomain }}:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/${{parameters.name}}
         path: "kustomize/base"
     - id: register
       name: Register
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
index 7afe5fc..5f358e6 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
@@ -14,7 +14,7 @@ metadata:
     apache-spark.cnoe.io/label-selector: env=dev,entity-id=${{values.name}}
     apache-spark.cnoe.io/cluster-name: local
   links:
-    - url: https://gitea.{{ .Values.edfbuilderDomain }}:443
+    - url: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443
       title: Repo URL
       icon: github
 spec:
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
index 4ca0604..fb3934a 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
@@ -35,7 +35,7 @@ spec:
       input:
         description: This is an example app
         # Hard coded value for this demo purposes only.
-        repoUrl: gitea.{{ .Values.edfbuilderDomain }}:443/?repo=${{parameters.name}}
+        repoUrl: gitea.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}}
         defaultBranch: main
     - id: create-argocd-app
       name: Create ArgoCD App
@@ -46,7 +46,7 @@ spec:
         argoInstance: in-cluster
         projectName: default
         # necessary until we generate our own cert
-        repoUrl: https://gitea.{{ .Values.edfbuilderDomain }}:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/${{parameters.name}}
         path: "manifests"
     - id: register
       name: Register
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
index 5ee6cae..2444abd 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
@@ -10,7 +10,7 @@ metadata:
     backstage.io/kubernetes-namespace: default
     argocd/app-name: ${{values.name | dump}}
   links:
-    - url: https://gitea.{{ .Values.edfbuilderDomain }}:443
+    - url: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443
       title: Repo URL
       icon: github
 spec:
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml
index a86cd58..ee2a472 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml
@@ -31,7 +31,7 @@ spec:
       input:
         description: This is an example app
         # Hard coded value for this demo purposes only.
-        repoUrl: gitea.{{ .Values.edfbuilderDomain }}:443/?repo=${{parameters.name}}
+        repoUrl: gitea.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}}
         defaultBranch: main
     - id: create-argocd-app
       name: Create ArgoCD App
@@ -42,7 +42,7 @@ spec:
         argoInstance: in-cluster
         projectName: default
         # necessary until we generate our own cert
-        repoUrl: https://gitea.{{ .Values.edfbuilderDomain }}:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/${{parameters.name}}
         path: "manifests"
     - id: register
       name: Register
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml
index a9b3bc0..e476c6e 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml
@@ -9,7 +9,7 @@ metadata:
     backstage.io/kubernetes-label-selector: 'entity-id=${{ values.name }}'
     backstage.io/kubernetes-namespace: gitea
   links:
-    - url: https://gitea.{{ .Values.edfbuilderDomain }}:443
+    - url: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443
       title: Repo URL
       icon: git
 spec:
@@ -26,7 +26,7 @@ metadata:
   annotations:
     backstage.io/techdocs-ref: dir:.
   links:
-    - url: https://gitea.{{ .Values.edfbuilderDomain }}:443
+    - url: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443
       title: Gitea Repo
       icon: git
 spec:
diff --git a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml
index 492cf19..956e0b5 100644
--- a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml
+++ b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml
@@ -33,7 +33,7 @@ spec:
       name: Publish to Gitea
       action: publish:gitea
       input:
-        repoUrl: gitea.{{ .Values.edfbuilderDomain }}:443/?repo=${{parameters.name}}
+        repoUrl: gitea.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}}
         description: This is the repository for ${{ parameters.name }}
         sourcePath: ./skeleton
         defaultBranch: main
diff --git a/template/stacks/ref-implementation/backstage.yaml b/template/stacks/ref-implementation/backstage.yaml
index aab10eb..b4cc1a3 100644
--- a/template/stacks/ref-implementation/backstage.yaml
+++ b/template/stacks/ref-implementation/backstage.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
     path: "stacks/ref-implementation/backstage/manifests"
   destination:
diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml
index 570b762..6451dcb 100644
--- a/template/stacks/ref-implementation/backstage/manifests/install.yaml
+++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml
@@ -70,7 +70,7 @@ data:
   app-config.yaml: |
     app:
       title: CNOE Backstage
-      baseUrl: https://{{ .Values.edfbuilderDomain }}:443
+      baseUrl: https://{{ .Values.edfbuilderTargetDomain }}:443
     organization:
       name: CNOE
     backend:
@@ -80,7 +80,7 @@ data:
       # auth:
       #   keys:
       #     - secret: ${BACKEND_SECRET}
-      baseUrl: https://{{ .Values.edfbuilderDomain }}:443
+      baseUrl: https://{{ .Values.edfbuilderTargetDomain }}:443
       listen:
         port: 7007
         # Uncomment the following host directive to bind to specific interfaces
@@ -90,7 +90,7 @@ data:
         # Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference
         # Default Helmet Content-Security-Policy values can be removed by setting the key to false
       cors:
-        origin: https://{{ .Values.edfbuilderDomain }}:443
+        origin: https://{{ .Values.edfbuilderTargetDomain }}:443
         methods: [GET, HEAD, PATCH, POST, PUT, DELETE]
         credentials: true
       database:
@@ -106,12 +106,12 @@ data:
 
     integrations:
       gitea:
-        - baseUrl: https://gitea.{{ .Values.edfbuilderDomain }}:443
-          host: gitea.{{ .Values.edfbuilderDomain }}:443
+        - baseUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443
+          host: gitea.{{ .Values.edfbuilderTargetDomain }}:443
           username: ${GITEA_USERNAME}
           password: ${GITEA_PASSWORD}
-        - baseUrl: https://gitea.{{ .Values.edfbuilderDomain }}
-          host: gitea.{{ .Values.edfbuilderDomain }}
+        - baseUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }}
+          host: gitea.{{ .Values.edfbuilderTargetDomain }}
           username: ${GITEA_USERNAME}
           password: ${GITEA_PASSWORD}
     #  github:
@@ -165,7 +165,7 @@ data:
       locations:
         # Examples from a public GitHub repository.
         - type: url
-          target: https://gitea.{{ .Values.edfbuilderDomain }}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml
+          target: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml
           rules:
             - allow: [Component, System, API, Resource, Location, Template, User, Group]
     kubernetes:
@@ -180,7 +180,7 @@ data:
         - type: 'config'
           instances:
             - name: in-cluster
-              url: https://{{ .Values.edfbuilderDomain }}:443/argocd
+              url: https://{{ .Values.edfbuilderTargetDomain }}:443/argocd
               username: admin
               password: ${ARGOCD_ADMIN_PASSWORD}
     argoWorkflows:
@@ -373,14 +373,14 @@ spec:
     template:
       engineVersion: v2
       data:
-        BACKSTAGE_FRONTEND_URL: https://{{ .Values.edfbuilderDomain }}:443/backstage
+        BACKSTAGE_FRONTEND_URL: https://{{ .Values.edfbuilderTargetDomain }}:443/backstage
         POSTGRES_HOST: postgresql.backstage.svc.cluster.local
         POSTGRES_PORT: '5432'
         POSTGRES_DB: backstage
         POSTGRES_USER: backstage
         POSTGRES_PASSWORD: "{{.POSTGRES_PASSWORD}}"
-        ARGO_WORKFLOWS_URL: https://{{ .Values.edfbuilderDomain }}:443/argo-workflows
-        KEYCLOAK_NAME_METADATA: https://{{ .Values.edfbuilderDomain }}:443/keycloak/realms/cnoe/.well-known/openid-configuration
+        ARGO_WORKFLOWS_URL: https://{{ .Values.edfbuilderTargetDomain }}:443/argo-workflows
+        KEYCLOAK_NAME_METADATA: https://{{ .Values.edfbuilderTargetDomain }}:443/keycloak/realms/cnoe/.well-known/openid-configuration
         KEYCLOAK_CLIENT_SECRET: "{{.BACKSTAGE_CLIENT_SECRET}}"
         ARGOCD_AUTH_TOKEN: "argocd.token={{.ARGOCD_SESSION_TOKEN}}"
         ARGO_CD_URL: 'https://argocd-server.argocd.svc.cluster.local/api/v1/'
@@ -443,7 +443,7 @@ spec:
                 name: backstage
                 port:
                   name: http
-    - host: {{ .Values.edfbuilderDomain }}
+    - host: {{ .Values.edfbuilderTargetDomain }}
       http:
         paths:
           - path: /
diff --git a/template/stacks/ref-implementation/codespaces.md b/template/stacks/ref-implementation/codespaces.md
index fd49efe..37144ae 100644
--- a/template/stacks/ref-implementation/codespaces.md
+++ b/template/stacks/ref-implementation/codespaces.md
@@ -69,5 +69,5 @@ From here on, you can follow the instructions in the [README](./README.md) file.
 echo https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}
 ```
 
-For example, if you need to access Argo Workflows UI, instead of going to `https://{{ .Values.edfbuilderDomain }}:8443/argo`, 
+For example, if you need to access Argo Workflows UI, instead of going to `https://{{ .Values.edfbuilderTargetDomain }}:8443/argo`, 
 you go to `https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/argo`
diff --git a/template/stacks/ref-implementation/external-secrets.yaml b/template/stacks/ref-implementation/external-secrets.yaml
index 6aa398c..fdea39f 100644
--- a/template/stacks/ref-implementation/external-secrets.yaml
+++ b/template/stacks/ref-implementation/external-secrets.yaml
@@ -12,7 +12,7 @@ spec:
     namespace: external-secrets
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
     path: "stacks/ref-implementation/external-secrets/manifests"
   project: default
diff --git a/template/stacks/ref-implementation/keycloak.yaml b/template/stacks/ref-implementation/keycloak.yaml
index c17b83a..32bee77 100644
--- a/template/stacks/ref-implementation/keycloak.yaml
+++ b/template/stacks/ref-implementation/keycloak.yaml
@@ -12,7 +12,7 @@ spec:
     namespace: keycloak
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD
     path: "stacks/ref-implementation/keycloak/manifests"
   project: default
diff --git a/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml b/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml
index 2023015..6fea2c7 100644
--- a/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml
+++ b/template/stacks/ref-implementation/keycloak/manifests/ingress.yaml
@@ -18,7 +18,7 @@ spec:
                 name: keycloak
                 port:
                   name: http
-    - host: {{ .Values.edfbuilderDomain }}
+    - host: {{ .Values.edfbuilderTargetDomain }}
       http:
         paths:
           - path: /keycloak
diff --git a/template/stacks/ref-implementation/keycloak/manifests/install.yaml b/template/stacks/ref-implementation/keycloak/manifests/install.yaml
index 86ccaf1..82f1eeb 100644
--- a/template/stacks/ref-implementation/keycloak/manifests/install.yaml
+++ b/template/stacks/ref-implementation/keycloak/manifests/install.yaml
@@ -83,7 +83,7 @@ data:
     proxy=edge
     
     # hostname configuration
-    hostname={{ .Values.edfbuilderDomain }}
+    hostname={{ .Values.edfbuilderTargetDomain }}
     http-relative-path=keycloak
     
     # the admin url requires its own configuration to reflect correct url
diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
index 5383200..e48960e 100644
--- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
+++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
@@ -145,7 +145,7 @@ data:
       "rootUrl": "",
       "baseUrl": "",
       "redirectUris": [
-        "https://{{ .Values.edfbuilderDomain }}:443/argo-workflows/oauth2/callback"
+        "https://{{ .Values.edfbuilderTargetDomain }}:443/argo-workflows/oauth2/callback"
       ],
       "webOrigins": [
         "/*"
@@ -174,7 +174,7 @@ data:
       "rootUrl": "",
       "baseUrl": "",
       "redirectUris": [
-        "https://{{ .Values.edfbuilderDomain }}:443/api/auth/keycloak-oidc/handler/frame"
+        "https://{{ .Values.edfbuilderTargetDomain }}:443/api/auth/keycloak-oidc/handler/frame"
       ],
       "webOrigins": [
         "/*"
diff --git a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml b/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
index fa7a57b..d8d167c 100644
--- a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
+++ b/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
@@ -19,5 +19,5 @@ spec:
     namespace: crossplane-system
   source:
     path: stacks/second-cluster/create-new-cluster-guestbook
-    repoURL: https://gitea.{{ .Values.edfbuilderDomain }}/giteaAdmin/edfbuilder
+    repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder
     targetRevision: HEAD