diff --git a/.tofu/scripts/setup-cluster.sh b/.tofu/scripts/setup-cluster.sh
index 0651909..c36fb07 100644
--- a/.tofu/scripts/setup-cluster.sh
+++ b/.tofu/scripts/setup-cluster.sh
@@ -15,7 +15,7 @@ Usage: $0 <cluster> [options]
 
   Clusters:   aks-dev | aks-prod | eks-dev | eks-prod
               gke-dev | gke-prod | upc-dev | upc-prod
-              forte-group
+              upc-forte-group
               <platform>-workload (for workload clusters)
 
   Options:
diff --git a/_app-of-apps-forte-group.yaml b/_app-of-apps-upc-forte-group.yaml
similarity index 94%
rename from _app-of-apps-forte-group.yaml
rename to _app-of-apps-upc-forte-group.yaml
index 19492c3..94c4125 100644
--- a/_app-of-apps-forte-group.yaml
+++ b/_app-of-apps-upc-forte-group.yaml
@@ -20,7 +20,7 @@ spec:
   source:
     repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
     targetRevision: HEAD
-    path: infra/overlays/forte-group
+    path: infra/overlays/upc-forte-group
   destination:
     server: https://kubernetes.default.svc
     namespace: default
diff --git a/apps/overlays/upc-dev/kustomization.yaml b/apps/overlays/upc-dev/kustomization.yaml
index fbac63d..60265ca 100644
--- a/apps/overlays/upc-dev/kustomization.yaml
+++ b/apps/overlays/upc-dev/kustomization.yaml
@@ -9,7 +9,7 @@ resources:
 - forte-drop-mcp
 
 patches:
-# dot-ai-stack: swap upc-dev → forte-group
+# dot-ai-stack: swap upc-dev → upc-forte-group
 - target:
     kind: Application
     name: dot-ai-stack
diff --git a/apps/overlays/forte-group/kustomization.yaml b/apps/overlays/upc-forte-group/kustomization.yaml
similarity index 100%
rename from apps/overlays/forte-group/kustomization.yaml
rename to apps/overlays/upc-forte-group/kustomization.yaml
diff --git a/bootstrap.sh b/bootstrap.sh
index 240e03b..99592ec 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,7 +3,7 @@
 # in case of  $'\r': command not found error, run command below first
 # sed -i 's/\r$//' ./bootstrap.sh
 
-CLUSTER="${1:?Usage: ./bootstrap.sh <cluster> (upc-dev|upc-prod|forte-group|aks-dev|aks-prod|eks-dev|eks-prod|gke-dev|gke-prod)}"
+CLUSTER="${1:?Usage: ./bootstrap.sh <cluster> (upc-dev|upc-prod|upc-forte-group|aks-dev|aks-prod|eks-dev|eks-prod|gke-dev|gke-prod)}"
 
 echo "running $0 for cluster: ${CLUSTER}..."
 
diff --git a/clusters/forte-group.yaml b/clusters/forte-group.yaml
deleted file mode 100644
index c14a049..0000000
--- a/clusters/forte-group.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: prod-fd-no-svg1             # → infra/values/forte-group/argocd-values.yaml (notifications.context.clusterName)
-domain: fortedigital.com                 # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/forte-group/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.fortedigital.com  # → infra/values/forte-group/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.fortedigital.com      # → infra/values/forte-group/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.fortedigital.com    # → infra/values/forte-group/dot-ai-stack-values.yaml (dot-ai.ingress.host)
-dotaiUiDomain: kubemcpui.fortedigital.com # → infra/values/forte-group/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
-letsencryptEmail: danijel.simeunovic@fortedigital.com # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "172.16.1.0/24"             # → infra/values/forte-group/traefik-values.yaml (ports.*.trustedIPs)
-cloudProvider: upcloud                   # → determines overlay directory and cloud-specific LB/storage annotations
diff --git a/clusters/upc-forte-group.yaml b/clusters/upc-forte-group.yaml
new file mode 100644
index 0000000..cc323e3
--- /dev/null
+++ b/clusters/upc-forte-group.yaml
@@ -0,0 +1,12 @@
+# Cluster config reference — values must match the corresponding overlay files.
+# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+clusterName: prod-fd-no-svg1             # → infra/values/upc-forte-group/argocd-values.yaml (notifications.context.clusterName)
+domain: fortedigital.com                 # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/upc-forte-group/argocd-values.yaml (global.domain)
+grafanaDomain: grafana.fortedigital.com  # → infra/values/upc-forte-group/grafana-values.yaml (ingress.hosts)
+keycloakDomain: id.fortedigital.com      # → infra/values/upc-forte-group/keycloak-values.yaml (ingress.hostname)
+dotaiDomain: kubemcp.fortedigital.com    # → infra/values/upc-forte-group/dot-ai-stack-values.yaml (dot-ai.ingress.host)
+dotaiUiDomain: kubemcpui.fortedigital.com # → infra/values/upc-forte-group/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
+letsencryptEmail: danijel.simeunovic@fortedigital.com # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+trustedIPs: "172.16.1.0/24"             # → infra/values/upc-forte-group/traefik-values.yaml (ports.*.trustedIPs)
+cloudProvider: upcloud                   # → determines overlay directory and cloud-specific LB/storage annotations
diff --git a/infra/overlays/forte-group/kustomization.yaml b/infra/overlays/upc-forte-group/kustomization.yaml
similarity index 71%
rename from infra/overlays/forte-group/kustomization.yaml
rename to infra/overlays/upc-forte-group/kustomization.yaml
index 5a60045..3b65631 100644
--- a/infra/overlays/forte-group/kustomization.yaml
+++ b/infra/overlays/upc-forte-group/kustomization.yaml
@@ -24,38 +24,38 @@ resources:
 - ../../base/vault
 
 patches:
-# Traefik: swap upc-dev → forte-group
+# Traefik: swap upc-dev → upc-forte-group
 - target:
     kind: Application
     name: traefik
   patch: |
     - op: replace
       path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/forte-group/traefik-values.yaml
+      value: $values/infra/values/upc-forte-group/traefik-values.yaml
 
-# Grafana: swap upc-dev → forte-group  
+# Grafana: swap upc-dev → upc-forte-group  
 - target:
     kind: Application
     name: grafana
   patch: |
     - op: replace
       path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/forte-group/grafana-values.yaml
+      value: $values/infra/values/upc-forte-group/grafana-values.yaml
 
-# OpenCost: swap upc-dev → forte-group
+# OpenCost: swap upc-dev → upc-forte-group
 - target:
     kind: Application
     name: opencost
   patch: |
     - op: replace
       path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/forte-group/opencost-values.yaml
+      value: $values/infra/values/upc-forte-group/opencost-values.yaml
 
-# Gitea: swap upc-dev → forte-group
+# Gitea: swap upc-dev → upc-forte-group
 - target:
     kind: Application
     name: gitea
   patch: |
     - op: replace
       path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/forte-group/gitea-values.yaml
+      value: $values/infra/values/upc-forte-group/gitea-values.yaml
diff --git a/infra/values/forte-group/argocd-values.yaml b/infra/values/upc-forte-group/argocd-values.yaml
similarity index 100%
rename from infra/values/forte-group/argocd-values.yaml
rename to infra/values/upc-forte-group/argocd-values.yaml
diff --git a/infra/values/forte-group/gitea-values.yaml b/infra/values/upc-forte-group/gitea-values.yaml
similarity index 100%
rename from infra/values/forte-group/gitea-values.yaml
rename to infra/values/upc-forte-group/gitea-values.yaml
diff --git a/infra/values/forte-group/grafana-values.yaml b/infra/values/upc-forte-group/grafana-values.yaml
similarity index 100%
rename from infra/values/forte-group/grafana-values.yaml
rename to infra/values/upc-forte-group/grafana-values.yaml
diff --git a/infra/values/forte-group/keycloak-values.yaml b/infra/values/upc-forte-group/keycloak-values.yaml
similarity index 100%
rename from infra/values/forte-group/keycloak-values.yaml
rename to infra/values/upc-forte-group/keycloak-values.yaml
diff --git a/infra/values/forte-group/opencost-values.yaml b/infra/values/upc-forte-group/opencost-values.yaml
similarity index 100%
rename from infra/values/forte-group/opencost-values.yaml
rename to infra/values/upc-forte-group/opencost-values.yaml
diff --git a/infra/values/forte-group/traefik-values.yaml b/infra/values/upc-forte-group/traefik-values.yaml
similarity index 100%
rename from infra/values/forte-group/traefik-values.yaml
rename to infra/values/upc-forte-group/traefik-values.yaml