diff --git a/argocd-apps/applications/infrastructure/external-secrets.yaml b/argocd-apps/applications/infrastructure/external-secrets.yaml
index 36b841e..a49996d 100644
--- a/argocd-apps/applications/infrastructure/external-secrets.yaml
+++ b/argocd-apps/applications/infrastructure/external-secrets.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: infrastructure/external-secrets
   destination:
diff --git a/argocd-apps/applications/infrastructure/gateway.yaml b/argocd-apps/applications/infrastructure/gateway.yaml
index a933086..cddfdea 100644
--- a/argocd-apps/applications/infrastructure/gateway.yaml
+++ b/argocd-apps/applications/infrastructure/gateway.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: infrastructure/gateway/envoy
     directory:
diff --git a/argocd-apps/applications/infrastructure/longhorn.yaml b/argocd-apps/applications/infrastructure/longhorn.yaml
index a45efb5..762f314 100644
--- a/argocd-apps/applications/infrastructure/longhorn.yaml
+++ b/argocd-apps/applications/infrastructure/longhorn.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/longhorn
   destination:
diff --git a/argocd-apps/applications/infrastructure/namespaces.yaml b/argocd-apps/applications/infrastructure/namespaces.yaml
index bad9ef0..eb82258 100644
--- a/argocd-apps/applications/infrastructure/namespaces.yaml
+++ b/argocd-apps/applications/infrastructure/namespaces.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: infrastructure/namespaces
   destination:
diff --git a/argocd-apps/applications/infrastructure/network-policies.yaml b/argocd-apps/applications/infrastructure/network-policies.yaml
index 8a791ca..bc46bc3 100644
--- a/argocd-apps/applications/infrastructure/network-policies.yaml
+++ b/argocd-apps/applications/infrastructure/network-policies.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: infrastructure/network-policies
   destination:
diff --git a/argocd-apps/applications/management/argocd.yaml b/argocd-apps/applications/management/argocd.yaml
index 1d5d5c7..011b315 100644
--- a/argocd-apps/applications/management/argocd.yaml
+++ b/argocd-apps/applications/management/argocd.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/argocd
   destination:
diff --git a/argocd-apps/applications/management/forgejo.yaml b/argocd-apps/applications/management/forgejo.yaml
index 81f8d25..b8c248b 100644
--- a/argocd-apps/applications/management/forgejo.yaml
+++ b/argocd-apps/applications/management/forgejo.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/forgejo
   destination:
diff --git a/argocd-apps/applications/management/pgadmin.yaml b/argocd-apps/applications/management/pgadmin.yaml
index f823ddb..d281a76 100644
--- a/argocd-apps/applications/management/pgadmin.yaml
+++ b/argocd-apps/applications/management/pgadmin.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/pgadmin
   destination:
diff --git a/argocd-apps/applications/platform-services/platform-minio.yaml b/argocd-apps/applications/platform-services/platform-minio.yaml
index d56cc45..fc942f9 100644
--- a/argocd-apps/applications/platform-services/platform-minio.yaml
+++ b/argocd-apps/applications/platform-services/platform-minio.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/platform-minio
   destination:
diff --git a/argocd-apps/applications/platform-services/platform-postgres.yaml b/argocd-apps/applications/platform-services/platform-postgres.yaml
index 112279a..8e5bb5b 100644
--- a/argocd-apps/applications/platform-services/platform-postgres.yaml
+++ b/argocd-apps/applications/platform-services/platform-postgres.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/platform-postgres
   destination:
diff --git a/argocd-apps/applications/platform-services/platform-rabbitmq.yaml b/argocd-apps/applications/platform-services/platform-rabbitmq.yaml
index a2a31f9..73bf7e7 100644
--- a/argocd-apps/applications/platform-services/platform-rabbitmq.yaml
+++ b/argocd-apps/applications/platform-services/platform-rabbitmq.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/platform-rabbitmq
   destination:
diff --git a/argocd-apps/applications/platform-services/platform-redis.yaml b/argocd-apps/applications/platform-services/platform-redis.yaml
index e6b41bc..d07d021 100644
--- a/argocd-apps/applications/platform-services/platform-redis.yaml
+++ b/argocd-apps/applications/platform-services/platform-redis.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/platform-redis
   destination:
diff --git a/argocd-apps/applications/symcrest/symcrest-web.yaml b/argocd-apps/applications/symcrest/symcrest-web.yaml
index 58f6aeb..47a5f4b 100644
--- a/argocd-apps/applications/symcrest/symcrest-web.yaml
+++ b/argocd-apps/applications/symcrest/symcrest-web.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: rendered/symcrest-web
   destination:
diff --git a/argocd-apps/root-app.yaml b/argocd-apps/root-app.yaml
index a32b351..8edd5b1 100644
--- a/argocd-apps/root-app.yaml
+++ b/argocd-apps/root-app.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: platform
   source:
-    repoURL: https://www.symcrest.com/internal/dev/git/symcrest/k8s-platform.git
+    repoURL: http://forgejo.forgejo.svc.cluster.local:3000/symcrest/k8s-platform.git
     targetRevision: main
     path: argocd-apps
     directory:
diff --git a/charts/forgejo/values.yaml b/charts/forgejo/values.yaml
index a3e44cf..72b1cef 100644
--- a/charts/forgejo/values.yaml
+++ b/charts/forgejo/values.yaml
@@ -17,7 +17,7 @@ route:
   gatewayNamespace: apps
   hostnames:
     - www.symcrest.com
-  basePath: /internal/dev/git
+  basePath: /services/studio/forgejo
   serviceName: forgejo
   servicePort: 3000
 
diff --git a/charts/openproject/upstream-values.yaml b/charts/openproject/upstream-values.yaml
index 4db8435..afd3f5d 100644
--- a/charts/openproject/upstream-values.yaml
+++ b/charts/openproject/upstream-values.yaml
@@ -1,7 +1,7 @@
 openproject:
   https: true
   host: www.symcrest.com
-  railsRelativeUrlRoot: /internal/dev/projectmanagement
+  railsRelativeUrlRoot: /services/studio/openproject
 
   extraEnvVarsSecret: openproject-postgres-secret
 
diff --git a/charts/openproject/values.yaml b/charts/openproject/values.yaml
index 78192a8..3a0ba16 100644
--- a/charts/openproject/values.yaml
+++ b/charts/openproject/values.yaml
@@ -1,6 +1,6 @@
 hostnames:
   - www.symcrest.com
-basePath: /internal/dev/projectmanagement
+basePath: /services/studio/openproject
 gateway:
   name: public-gateway
   namespace: apps
diff --git a/charts/pgadmin/values.yaml b/charts/pgadmin/values.yaml
index 742ae85..d2f1cf9 100644
--- a/charts/pgadmin/values.yaml
+++ b/charts/pgadmin/values.yaml
@@ -21,6 +21,6 @@ route:
   gatewayNamespace: apps
   hostnames:
     - www.symcrest.com
-  basePath: /internal/dev/dbadmin/postgres
+  basePath: /services/studio/pgadmin
   serviceName: pgadmin
   servicePort: 80
diff --git a/infrastructure/gateway/envoy/routes/forgejo.yaml b/infrastructure/gateway/envoy/routes/forgejo.yaml
index 792b637..96929b4 100644
--- a/infrastructure/gateway/envoy/routes/forgejo.yaml
+++ b/infrastructure/gateway/envoy/routes/forgejo.yaml
@@ -13,15 +13,30 @@ spec:
     - matches:
         - path:
             type: Exact
-            value: /internal/dev/git
+            value: /services/studio/forgejo
       filters:
         - type: RequestRedirect
           requestRedirect:
             path:
               type: ReplaceFullPath
-              replaceFullPath: /internal/dev/git/
+              replaceFullPath: /services/studio/forgejo/
             statusCode: 301
 
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /services/studio/forgejo/
+      filters:
+        - type: URLRewrite
+          urlRewrite:
+            path:
+              type: ReplacePrefixMatch
+              replacePrefixMatch: /
+      backendRefs:
+        - name: forgejo
+          port: 3000
+
+    # Temporary compatibility path for Argo CD and existing Git remotes.
     - matches:
         - path:
             type: PathPrefix
diff --git a/infrastructure/gateway/envoy/routes/openproject.yaml b/infrastructure/gateway/envoy/routes/openproject.yaml
index 3710a71..544e614 100644
--- a/infrastructure/gateway/envoy/routes/openproject.yaml
+++ b/infrastructure/gateway/envoy/routes/openproject.yaml
@@ -13,7 +13,7 @@ spec:
     - matches:
         - path:
             type: PathPrefix
-            value: /internal/dev/projectmanagement
+            value: /services/studio/openproject
       backendRefs:
         - name: openproject
           port: 8080
diff --git a/infrastructure/gateway/envoy/routes/pgadmin.yaml b/infrastructure/gateway/envoy/routes/pgadmin.yaml
index 8d51c19..80e62b0 100644
--- a/infrastructure/gateway/envoy/routes/pgadmin.yaml
+++ b/infrastructure/gateway/envoy/routes/pgadmin.yaml
@@ -13,19 +13,19 @@ spec:
     - matches:
         - path:
             type: Exact
-            value: /internal/dev/dbadmin/postgres
+            value: /services/studio/pgadmin
       filters:
         - type: RequestRedirect
           requestRedirect:
             path:
               type: ReplaceFullPath
-              replaceFullPath: /internal/dev/dbadmin/postgres/
+              replaceFullPath: /services/studio/pgadmin/
             statusCode: 301
 
     - matches:
         - path:
             type: PathPrefix
-            value: /internal/dev/dbadmin/postgres/
+            value: /services/studio/pgadmin/
       backendRefs:
         - name: pgadmin
           port: 80
diff --git a/rendered/forgejo/forgejo.yaml b/rendered/forgejo/forgejo.yaml
index 20361e8..20b2ab5 100644
--- a/rendered/forgejo/forgejo.yaml
+++ b/rendered/forgejo/forgejo.yaml
@@ -59,7 +59,7 @@ spec:
               containerPort: 22
           env:
             - name: FORGEJO__server__ROOT_URL
-              value: "https://www.symcrest.com/internal/dev/git/"
+              value: "https://www.symcrest.com/services/studio/forgejo/"
             - name: FORGEJO__server__HTTP_PORT
               value: "3000"
             - name: FORGEJO__database__DB_TYPE
diff --git a/rendered/openproject/upstream-openproject.yaml b/rendered/openproject/upstream-openproject.yaml
index f817e72..50ed4f5 100644
--- a/rendered/openproject/upstream-openproject.yaml
+++ b/rendered/openproject/upstream-openproject.yaml
@@ -83,7 +83,7 @@ stringData:
   OPENPROJECT_HOST__NAME: "www.symcrest.com"
   OPENPROJECT_HSTS: "true"
   OPENPROJECT_RAILS__CACHE__STORE: "memcache"
-  OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "/internal/dev/projectmanagement"
+  OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "/services/studio/openproject"
   POSTGRES_STATEMENT_TIMEOUT: "120s"
 ...
 ---
@@ -124,7 +124,7 @@ metadata:
     "helm.sh/resource-policy": "keep"
 data: # reset data to make sure only keys defined below remain
 stringData:
-  secret-key-base: ydQvzBCGhvxuoMLCB25TOfqfMAzCgROooYKzWeac2MSQ6I1YCa62HQw5KFTyHaRU
+  secret-key-base: 2NvoLwisgyb1TI1TFHbiJ07gQn5lkIBuzxehR4Wea1DpsYpD3Rh3xfaIgkT2Tmzu
 ...
 ---
 # Source: openproject/templates/persistentvolumeclaim.yaml
@@ -331,7 +331,7 @@ spec:
         
         # annotate pods with env value checksums so changes trigger re-deployments
         
-        checksum/env-core: 4d455db544e55fa9615b889773dff0800b54259754f45df6e95a050e1f9e581f
+        checksum/env-core: 2d0e679fb4fde1d473b3f274fa94ae520dd26c1045409de808b7562f7b64a454
         checksum/env-memcached: fd1a022eb3ba9e1437809d0177660fdab3ae79b4fcfbee2f8ec1264ee0aa944d
         checksum/env-oidc: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/env-s3: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
@@ -546,7 +546,7 @@ spec:
         
         # annotate pods with env value checksums so changes trigger re-deployments
         
-        checksum/env-core: 4d455db544e55fa9615b889773dff0800b54259754f45df6e95a050e1f9e581f
+        checksum/env-core: 2d0e679fb4fde1d473b3f274fa94ae520dd26c1045409de808b7562f7b64a454
         checksum/env-memcached: fd1a022eb3ba9e1437809d0177660fdab3ae79b4fcfbee2f8ec1264ee0aa944d
         checksum/env-oidc: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/env-s3: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
@@ -722,7 +722,7 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: "/internal/dev/projectmanagement/health_checks/default"
+              path: "/services/studio/openproject/health_checks/default"
               port: 8080
               httpHeaders:
                 # required otherwise health check will return 404 because health check is done using the Pod IP, which may cause issues with downstream variants
@@ -735,7 +735,7 @@ spec:
             successThreshold: 1
           readinessProbe:
             httpGet:
-              path: "/internal/dev/projectmanagement/health_checks/default"
+              path: "/services/studio/openproject/health_checks/default"
               port: 8080
               httpHeaders:
                 # required otherwise health check will return 404 because health check is done using the Pod IP, which may cause issues with downstream variants
@@ -748,7 +748,7 @@ spec:
             successThreshold: 1
           startupProbe:
             httpGet:
-              path: "/internal/dev/projectmanagement/health_checks/default"
+              path: "/services/studio/openproject/health_checks/default"
               port: 8080
               httpHeaders:
                 # required otherwise health check will return 404 because health check is done using the Pod IP, which may cause issues with downstream variants
@@ -797,7 +797,7 @@ spec:
         
         # annotate pods with env value checksums so changes trigger re-deployments
         
-        checksum/env-core: 4d455db544e55fa9615b889773dff0800b54259754f45df6e95a050e1f9e581f
+        checksum/env-core: 2d0e679fb4fde1d473b3f274fa94ae520dd26c1045409de808b7562f7b64a454
         checksum/env-memcached: fd1a022eb3ba9e1437809d0177660fdab3ae79b4fcfbee2f8ec1264ee0aa944d
         checksum/env-oidc: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/env-s3: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
diff --git a/rendered/pgadmin/pgadmin.yaml b/rendered/pgadmin/pgadmin.yaml
index 7d2aa00..3a59686 100644
--- a/rendered/pgadmin/pgadmin.yaml
+++ b/rendered/pgadmin/pgadmin.yaml
@@ -63,7 +63,7 @@ spec:
                 name: pgadmin-secret
           env:
             - name: SCRIPT_NAME
-              value: "/internal/dev/dbadmin/postgres"
+              value: "/services/studio/pgadmin"
           volumeMounts:
             - name: pgadmin-data
               mountPath: /var/lib/pgadmin