diff --git a/README.md b/README.md
index 531a8425..a6af065c 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ This can be useful in several ways:
 
 Kubernetes: `kubectl get pods`
 
-Argo: https://argocd.idpbuilder.cnoe.io.localtest.me:8443/
+Argo: https://argocd.cnoe.localtest.me:8443/
 
-Backstage: https://backstage.idpbuilder.cnoe.io.localtest.me:8443/
+Backstage: https://backstage.cnoe.localtest.me:8443/
 
 ## Architecture
 
diff --git a/pkg/apps/srv/argocd/ingress.yaml b/pkg/apps/srv/argocd/ingress.yaml
index 7b17b118..5ac96cd3 100644
--- a/pkg/apps/srv/argocd/ingress.yaml
+++ b/pkg/apps/srv/argocd/ingress.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   ingressClassName: "nginx"
   rules:
-  - host: argocd.idpbuilder.cnoe.io.localtest.me
+  - host: argocd.cnoe.localtest.me
     http:
       paths:
       - path: /
diff --git a/pkg/apps/srv/backstage/install.yaml b/pkg/apps/srv/backstage/install.yaml
index 959b07fa..fb960b2d 100644
--- a/pkg/apps/srv/backstage/install.yaml
+++ b/pkg/apps/srv/backstage/install.yaml
@@ -130,7 +130,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: backstage.idpbuilder.cnoe.io.localtest.me
+    - host: backstage.cnoe.localtest.me
       http:
         paths:
           - backend:
@@ -152,17 +152,17 @@ data:
   app-config.yaml: |
     app:
       title: CNOE
-      baseUrl: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443"
+      baseUrl: "https://backstage.cnoe.localtest.me:8443"
     organization:
       name: CNOE
     backend:
-      baseUrl: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443"
+      baseUrl: "https://backstage.cnoe.localtest.me:8443"
       listen:
         port: 7007
       csp:
         connect-src: ["'self'", 'http:', 'https:']
       cors:
-        origin: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443"
+        origin: "https://backstage.cnoe.localtest.me:8443"
         methods: [GET, HEAD, PATCH, POST, PUT, DELETE]
         credentials: true
       database:
diff --git a/pkg/controllers/gitserver/controller.go b/pkg/controllers/gitserver/controller.go
index 72cb5a10..dc112c5b 100644
--- a/pkg/controllers/gitserver/controller.go
+++ b/pkg/controllers/gitserver/controller.go
@@ -23,7 +23,7 @@ import (
 const (
 	gitServerResourceName            string = "gitserver"
 	gitServerDeploymentContainerName string = "httpd"
-	gitServerIngressHostnameBase     string = ".idpbuilder.cnoe.io.localtest.me"
+	gitServerIngressHostnameBase     string = ".cnoe.localtest.me"
 	repoUrlFmt                       string = "http://%s.%s.svc/idpbuilder-resources.git"
 )
 
diff --git a/pkg/controllers/localbuild/controller.go b/pkg/controllers/localbuild/controller.go
index f89f81e0..74fc89de 100644
--- a/pkg/controllers/localbuild/controller.go
+++ b/pkg/controllers/localbuild/controller.go
@@ -24,7 +24,7 @@ const (
 	EmbeddedGitServerName            string = "embedded"
 	gitServerResourceName            string = "gitserver"
 	gitServerDeploymentContainerName string = "httpd"
-	gitServerIngressHostnameBase     string = ".idpbuilder.cnoe.io.localtest.me"
+	gitServerIngressHostnameBase     string = ".cnoe.localtest.me"
 	repoUrlFmt                       string = "http://%s.%s.svc/idpbuilder-resources.git"
 )