diff --git a/otc/ABC/stacks/core/forgejo-runner/dind-docker.yaml b/otc/ABC/stacks/core/forgejo-runner/dind-docker.yaml
index bf3d3ef..5e52829 100644
--- a/otc/ABC/stacks/core/forgejo-runner/dind-docker.yaml
+++ b/otc/ABC/stacks/core/forgejo-runner/dind-docker.yaml
@@ -51,7 +51,7 @@ spec:
                   name: forgejo-runner-token
                   key: token
             - name: FORGEJO_INSTANCE_URL
-              value: https://ABC
+              value: https://gitea.ABC
           volumeMounts:
             - name: runner-data
               mountPath: /data
diff --git a/otc/ABC/stacks/core/forgejo/values.yaml b/otc/ABC/stacks/core/forgejo/values.yaml
index fc10e47..e53341a 100644
--- a/otc/ABC/stacks/core/forgejo/values.yaml
+++ b/otc/ABC/stacks/core/forgejo/values.yaml
@@ -30,11 +30,11 @@ gitea:
     queue:
       TYPE: level
     server:
-      DOMAIN: 'ABC'
-      ROOT_URL: 'https://ABC:443'
+      DOMAIN: 'gitea.ABC'
+      ROOT_URL: 'https://gitea.ABC:443'
     mailer:
       ENABLED: true
-      FROM: forgejo@ABC
+      FROM: forgejo@gitea.ABC
       PROTOCOL: smtp
       SMTP_ADDR: mailhog.mailhog.svc.cluster.local
       SMTP_PORT: 1025
diff --git a/otc/ABC/stacks/core/ingress-apps/forgejo.yaml b/otc/ABC/stacks/core/ingress-apps/forgejo.yaml
index 775140a..b1d6e13 100644
--- a/otc/ABC/stacks/core/ingress-apps/forgejo.yaml
+++ b/otc/ABC/stacks/core/ingress-apps/forgejo.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: ABC
+  - host: gitea.ABC
     http:
       paths:
       - backend:
@@ -23,5 +23,5 @@ spec:
         pathType: Prefix
   tls:
   - hosts:
-    - ABC
+    - gitea.ABC
     secretName: forgejo-net-tls
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
index ee92038..e6f92cb 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
+++ b/otc/ABC/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://ABC:443
+    - url: https://gitea.ABC:443
       title: Repo URL
       icon: github
 spec:
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
index a8e76a0..dd3b8e2 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
+++ b/otc/ABC/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: ABC:443/?repo=${{parameters.name}}
+        repoUrl: gitea.ABC: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://ABC:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.ABC:443/giteaAdmin/${{parameters.name}}
         path: "kustomize/base"
     - id: register
       name: Register
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
index 54021d8..5f89227 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
+++ b/otc/ABC/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://ABC:443
+    - url: https://gitea.ABC:443
       title: Repo URL
       icon: github
 spec:
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
index b0cef71..bd18538 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
+++ b/otc/ABC/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: ABC:443/?repo=${{parameters.name}}
+        repoUrl: gitea.ABC: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://ABC:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.ABC:443/giteaAdmin/${{parameters.name}}
         path: "manifests"
     - id: register
       name: Register
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
index 2d0a6b3..f9597d9 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
+++ b/otc/ABC/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://ABC:443
+    - url: https://gitea.ABC:443
       title: Repo URL
       icon: github
 spec:
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml
index bce1dd2..d87ab0f 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml
+++ b/otc/ABC/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: ABC:443/?repo=${{parameters.name}}
+        repoUrl: gitea.ABC: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://ABC:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.ABC:443/giteaAdmin/${{parameters.name}}
         path: "manifests"
     - id: register
       name: Register
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml
index 99775ca..615b409 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml
+++ b/otc/ABC/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://ABC:443
+    - url: https://gitea.ABC:443
       title: Repo URL
       icon: git
 spec:
@@ -26,7 +26,7 @@ metadata:
   annotations:
     backstage.io/techdocs-ref: dir:.
   links:
-    - url: https://ABC:443
+    - url: https://gitea.ABC:443
       title: Gitea Repo
       icon: git
 spec:
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml
index a2ee68b..cec6262 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml
+++ b/otc/ABC/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: ABC:443/?repo=${{parameters.name}}
+        repoUrl: gitea.ABC:443/?repo=${{parameters.name}}
         description: This is the repository for ${{ parameters.name }}
         sourcePath: ./skeleton
         defaultBranch: main
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml
index cfd3099..5a30b0f 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml
+++ b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml
@@ -33,7 +33,7 @@ jobs:
         #run: ./mvnw spring-boot:build-image # the original image build
         run: |
           export CONTAINER_REPO=$(echo {% raw %}${{ env.GITHUB_REPOSITORY }}{% endraw %} | tr '[:upper:]' '[:lower:]')
-          ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage=ABC/${CONTAINER_REPO}:latest -Djib.to.auth.username={% raw %}${{ secrets.PACKAGES_USER }}{% endraw %} -Djib.to.auth.password={% raw %}${{ secrets.PACKAGES_TOKEN }}{% endraw %} -Djib.from.platforms=linux/arm64,linux/amd64
+          ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage=gitea.ABC/${CONTAINER_REPO}:latest -Djib.to.auth.username={% raw %}${{ secrets.PACKAGES_USER }}{% endraw %} -Djib.to.auth.password={% raw %}${{ secrets.PACKAGES_TOKEN }}{% endraw %} -Djib.from.platforms=linux/arm64,linux/amd64
       - name: Build image as tar
         run: |
           ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:buildTar -Djib.allowInsecureRegistries=true
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml
index 090ace2..5c75a76 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml
+++ b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/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://ABC:443
+    - url: https://gitea.ABC:443
       title: Repo URL
       icon: git
 spec:
@@ -26,7 +26,7 @@ metadata:
   annotations:
     backstage.io/techdocs-ref: dir:.
   links:
-    - url: https://ABC:443
+    - url: https://gitea.ABC:443
       title: Gitea Repo
       icon: git
 spec:
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml
index 57647d4..09dfc22 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml
+++ b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml
@@ -58,7 +58,7 @@ spec:
     spec:
       containers:
         - name: workload
-          image: ABC/giteaadmin/${{ values.name }}
+          image: gitea.ABC/giteaadmin/${{ values.name }}
           env:
             - name: SPRING_PROFILES_ACTIVE
               value: postgres
diff --git a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml
index e590d82..4a50462 100644
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml
+++ b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml
@@ -50,7 +50,7 @@ spec:
       name: Publish to Gitea
       action: publish:gitea
       input:
-        repoUrl: ABC:443/?repo=${{parameters.name}}
+        repoUrl: gitea.ABC:443/?repo=${{parameters.name}}
         description: This is the repository for ${{ parameters.name }}
         sourcePath: ./
         defaultBranch: main
@@ -64,7 +64,7 @@ spec:
         argoInstance: in-cluster
         projectName: default
         # necessary until we generate our own cert
-        repoUrl: https://ABC:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://gitea.ABC:443/giteaAdmin/${{parameters.name}}
         path: "k8s"
 
     - id: register
diff --git a/otc/ABC/stacks/ref-implementation/backstage/manifests/install.yaml b/otc/ABC/stacks/ref-implementation/backstage/manifests/install.yaml
index e2e4fb4..1417816 100644
--- a/otc/ABC/stacks/ref-implementation/backstage/manifests/install.yaml
+++ b/otc/ABC/stacks/ref-implementation/backstage/manifests/install.yaml
@@ -106,12 +106,12 @@ data:
 
     integrations:
       gitea:
-        - baseUrl: https://ABC:443
-          host: ABC:443
+        - baseUrl: https://gitea.ABC:443
+          host: gitea.ABC:443
           username: ${GITEA_USERNAME}
           password: ${GITEA_PASSWORD}
-        - baseUrl: https://ABC
-          host: ABC
+        - baseUrl: https://gitea.ABC
+          host: gitea.ABC
           username: ${GITEA_USERNAME}
           password: ${GITEA_PASSWORD}
         - baseUrl: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live
diff --git a/otc/ABC/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/otc/ABC/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
index e11e565..4aac235 100644
--- a/otc/ABC/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
+++ b/otc/ABC/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
@@ -270,7 +270,7 @@ data:
       "rootUrl": "",
       "baseUrl": "",
       "redirectUris": [
-        "https://ABC/*"
+        "https://gitea.ABC/*"
       ],
       "webOrigins": [
         "/*"