Add renovate.json

2026-04-14 10:19:10 +00:00
173 changed files with 2762 additions and 4139 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-# Force LF line endings for shell scripts
-*.sh text eol=lf
--- a/.gitea/workflows/ai-review.yaml
+++ b/.gitea/workflows/ai-review.yaml
@@ -1,47 +0,0 @@
-name: AI Code Review
-
-on:
-  pull_request:
-    types: [ labeled, synchronize ]
-
-jobs:
-  ai-review:
-    if: >-
-      (github.event.action == 'synchronized' && contains(toJSON(github.event.pull_request.labels), 'ai-review')) || contains(toJSON(gitea.event.changes.added_labels), 'ai-review')
-    runs-on: ubuntu-latest
-
-    env:
-      AI_REVIEW_CONFIG_FILE_YAML: ./shared-prompts/iac/.ai-review.yaml
-      # VCS configuration
-      VCS__PROVIDER: GITEA
-      VCS__PIPELINE__OWNER: ${{ github.repository_owner }}
-      VCS__PIPELINE__REPO: ${{ github.event.repository.name }}
-      VCS__PIPELINE__PULL_NUMBER: ${{ github.event.pull_request.number }}
-      VCS__HTTP_CLIENT__API_URL: https://git.forteapps.net/api/v1
-      VCS__HTTP_CLIENT__API_TOKEN: ${{ secrets.AI_REVIEW_TOKEN }}
-      # Review — disable fallback to see real Gitea API errors
-      REVIEW__INLINE_COMMENT_FALLBACK: "false"
-      # LLM configuration
-      LLM__PROVIDER: CLAUDE
-      LLM__META__MODEL: claude-sonnet-4-20250514
-      LLM__META__MAX_TOKENS: "4096"
-      LLM__HTTP_CLIENT__API_URL: https://api.anthropic.com
-      LLM__HTTP_CLIENT__API_TOKEN: ${{ secrets.ANTHROPIC_API_KEY }}
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-        fetch-depth: 0
-        token: ${{ secrets.AI_REVIEW_TOKEN }}
-
-    - name: Run inline review
-      uses: docker://nikitafilonov/ai-review:v0.64.0
-      with:
-        args: ai-review run-inline
-
-    - name: Run summary review
-      uses: docker://nikitafilonov/ai-review:v0.64.0
-      with:
-        args: ai-review run-summary
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,34 @@
+name: Deploy Gitea Pages
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+    - 'docs/**'
+    - 'mkdocs.yml'
+  workflow_dispatch:
+
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        apt-get update -qq
+        apt-get install -y -qq python3-pip
+        pip3 install --break-system-packages mkdocs mkdocs-material
+
+    - run: mkdocs build
+
+    - name: Deploy to Gitea Pages
+      run: |
+        cd site
+        git init
+        git config user.name "gitea-actions"
+        git config user.email "actions@forteapps.net"
+        git add .
+        git commit -m "Deploy docs"
+        git push --force "https://x-token:${{ secrets.GITEA_TOKEN }}@git.forteapps.net/Forte/launchpad.git" HEAD:gitea-pages
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "shared-prompts"]
-	path = shared-prompts
-	url = https://git.forteapps.net/Forte/ai-review-prompts.git
--- a/.project-standards.yaml
+++ b/.project-standards.yaml
@@ -0,0 +1,7 @@
+standards_version: "2025.1"
+last_configured: "2026-04-04"
+components:
+  github-pages: "2025.1"
+  github-pages-generator: "mkdocs"
+  github-pages-source: "docs/"
+  github-pages-theme: "material"
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Kubernetes Cluster - GitOps Configuration

-> **Kubernetes cluster bootstrapping and GitOps configuration repository** using ArgoCD for multi-cloud Kubernetes (UpCloud, AWS EKS, Azure AKS, GCP GKE)
+> **Kubernetes cluster bootstrapping and GitOps configuration repository** using ArgoCD for UpCloud Managed Kubernetes

 [![GitOps](https://img.shields.io/badge/GitOps-ArgoCD-blue)](https://argoproj.github.io/cd/)
-[![Kubernetes](https://img.shields.io/badge/Kubernetes-Multi--Cloud-orange)]()
+[![Kubernetes](https://img.shields.io/badge/Kubernetes-UpCloud-orange)](https://upcloud.com/)

 ---

@@ -83,38 +83,20 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 ├── bootstrap.sh                # Cluster initialization script
 ├── _app-of-apps.yaml          # Root ArgoCD Application (App-of-Apps pattern)
 │
-├── infra/                     # Infrastructure ArgoCD Applications (Kustomize multi-cluster)
-│   ├── base/                  # Base ArgoCD Application manifests (EU defaults)
-│   │   ├── kustomization.yaml
-│   │   ├── traefik-application.yaml
-│   │   ├── keycloak.yaml
-│   │   ├── grafana.yaml
-│   │   ├── gitea.yaml
-│   │   ├── gitea-actions.yaml
-│   │   ├── tempo.yaml
-│   │   ├── renovate.yaml
-│   │   ├── ...                # All other Application manifests
-│   │   └── secrets.yaml
-│   ├── overlays/              # Per-cluster overrides (Kustomize)
-│   │   ├── upc-dev/           # UpCloud Dev (uses base as-is)
-│   │   ├── upc-prod/         # UpCloud Prod (patches value paths)
-│   │   ├── eks-dev/           # AWS EKS Dev
-│   │   ├── eks-prod/         # AWS EKS Prod
-│   │   ├── aks-dev/        # Azure AKS Dev
-│   │   ├── aks-prod/       # Azure AKS Prod
-│   │   ├── gke-dev/          # GCP GKE Dev
-│   │   └── gke-prod/         # GCP GKE Prod
-│   ├── dashboards/            # Grafana dashboard ConfigMaps
+├── infra/                     # Infrastructure ArgoCD Applications
+│   ├── enterprise-apps.yaml   # Manages all apps in apps/ folder
+│   ├── traefik-application.yaml
+│   ├── cert-manager-application.yaml
+│   ├── kyverno.yaml
+│   ├── prometheus.yaml
+│   ├── grafana.yaml
+│   ├── loki.yaml
+│   ├── tempo.yaml
+│   ├── fluent-bit.yaml
+│   ├── trivy.yaml
+│   ├── sealedsecrets.yaml
+│   ├── renovate.yaml
 │   └── values/                # Helm value overrides
-│       ├── base/              # Shared cloud-agnostic values
-│       ├── upc-dev/           # UpCloud Dev (storage, LB, pricing)
-│       ├── upc-prod/         # UpCloud Prod
-│       ├── eks-dev/           # AWS EKS Dev
-│       ├── eks-prod/         # AWS EKS Prod
-│       ├── aks-dev/        # Azure AKS Dev
-│       ├── aks-prod/       # Azure AKS Prod
-│       ├── gke-dev/          # GCP GKE Dev
-│       └── gke-prod/         # GCP GKE Prod
 │
 ├── apps/                      # Business Applications
 │   ├── mcp10x.yaml
@@ -158,12 +140,12 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 |------------|---------|-----------|-----------|
 | **[launchpad](https://git.forteapps.net/Forte/launchpad)** (this repo) | ArgoCD Applications, cluster resources | Platform / DevOps engineers | ✅ Often |
 | **[forte-helm](https://git.forteapps.net/Forte/forte-helm)** | Generic Helm chart templates | Platform engineers | ❌ Rarely |
-| **[helm-prod-values](ssh://git@git.forteapps.net:2222/Forte/helm-prod-values.git)** | App-specific configuration & versions | Developers / CI pipelines | ✅ Sometimes |
+| **[helm-values](ssh://git@git.forteapps.net:2222/Forte/helm-prod-values.git)** | App-specific configuration & versions | Developers / CI pipelines | ✅ Sometimes |

 ### GitOps Workflow

 ```
-Developer commits code → CI/CD builds image → Updates helm-prod-values → ArgoCD syncs → Deployed to cluster
+Developer commits code → CI/CD builds image → Updates helm-values → ArgoCD syncs → Deployed to cluster
 ```

 **Learn more**: [GitOps Architecture - GitOps Workflow](docs/GITOPS-ARCHITECTURE.md#gitops-workflow)
@@ -178,7 +160,7 @@ Developer commits code → CI/CD builds image → Updates helm-prod-values → A

 **Quick version**:
 1. Create `apps/myapp.yaml` (ArgoCD Application manifest)
-2. Create `helm-prod-values/myapp/values.yaml` (configuration)
+2. Create `helm-values/myapp/values.yaml` (configuration)
 3. Create sealed secrets if needed
 4. Commit and push - ArgoCD auto-syncs!

@@ -187,8 +169,8 @@ Developer commits code → CI/CD builds image → Updates helm-prod-values → A
 **See detailed guide**: [Developer Guide - Updating an Existing Application](docs/DEVELOPER-GUIDE.md#updating-an-existing-application)

 **Quick version**:
- **Update code**: Push to app repo → CI/CD updates image tag in helm-prod-values
- **Update config**: Edit `helm-prod-values/myapp/values.yaml` → commit → push
+- **Update code**: Push to app repo → CI/CD updates image tag in helm-values
+- **Update config**: Edit `helm-values/myapp/values.yaml` → commit → push

 ### Manage Secrets

@@ -216,7 +198,7 @@ git push

 **Quick version**:
 ```yaml
-# In helm-prod-values/myapp/values.yaml
+# In helm-values/myapp/values.yaml

 # Token-based auth (simple)
 auth:
@@ -355,6 +337,7 @@ kubectl patch application myapp -n argocd \
 | **Fluent-Bit** | Log shipping | `monitoring` | DaemonSet |
 | **OpenCost** | Cost monitoring | `monitoring` | 1 |
 | **Renovate** | Dependency updates | `renovate` | CronJob |
+| **Trivy** | Vulnerability scanning | `trivy-system` | 1 |

 **Full specs**: [Technical Reference - Infrastructure Components](docs/REFERENCE.md#infrastructure-components)

@@ -372,12 +355,12 @@ kubectl patch application myapp -n argocd \
 ## 📖 Key Concepts

 ### App-of-Apps Pattern
-`_app-of-apps-{cluster}.yaml` is the root Application that manages all other Applications in `infra/`. Kustomize overlays in `infra/overlays/{cluster}/` render the base Applications with per-cluster patches (e.g., swapping value file paths). Supported clusters: `upc-dev`, `upc-prod`, `eks-dev`, `eks-prod`, `aks-dev`, `aks-prod`, `gke-dev`, `gke-prod`.
+`_app-of-apps.yaml` is the root Application that manages all other Applications in `infra/`. Each YAML in `infra/` becomes a child Application managed by ArgoCD.

 ### Multi-Source Pattern
 Applications reference both:
 1. **Helm charts** from `forte-helm` (templates)
-2. **Values** from `helm-prod-values` (configuration)
+2. **Values** from `helm-values` (configuration)

 This separates reusable templates from environment-specific config.

@@ -446,7 +429,7 @@ Applications deploy in order using `argocd.argoproj.io/sync-wave`:
 ### Adding a New Application
 1. Read [Developer Guide - Deploying Your First Application](docs/DEVELOPER-GUIDE.md#deploying-your-first-application)
 2. Create ArgoCD Application manifest in `apps/`
-3. Create Helm values in `helm-prod-values/`
+3. Create Helm values in `helm-values/`
 4. Create sealed secrets if needed
 5. Commit and push - ArgoCD handles the rest!

@@ -469,14 +452,16 @@ Documentation lives in `docs/`. To update:
 ## 📝 Notes

 ### Current Environment
- **Provider**: Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE)
- **Active clusters**: UpCloud (upc-dev, upc-prod)
+- **Provider**: UpCloud Managed Kubernetes
 - **Environment**: Production (internal use only)
+- **Cluster**: Single cluster
 - **Auth**: Disabled for ArgoCD (internal access)
- **Backup**: Gitea daily backup to S3-compatible storage
+- **Backup**: None (cluster rebuildable via GitOps)

 ### Known Limitations
+- No automated backups (yet)
 - Secret rotation not automated
+- Single cluster (no multi-cluster setup)
 - DNS management is manual

 **Future improvements**: See [Operations Runbook - Disaster Recovery](docs/OPERATIONS-RUNBOOK.md#disaster-recovery)
@@ -494,8 +479,8 @@ Documentation lives in `docs/`. To update:
 - [Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets)

 ### Related Repositories
- [forte-helm](https://git.forteapps.net/Forte/forte-helm) - Helm chart templates
- [helm-prod-values](git@github.com:fortedigital/helm-prod-values.git) - Application values
+- [forte-helm](https://github.com/fortedigital/forte-helm) - Helm chart templates
+- [helm-values](git@github.com:fortedigital/helm-values.git) - Application values

 ---

@@ -513,7 +498,7 @@ Internal use only. Not for public distribution.

 ---

-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Documentation Version**: 1.0.0

 **🚀 Ready to get started? Check out the [Documentation Index](docs/README.md)!**
--- a/_app-of-apps-aks-dev.yaml
+++ b/_app-of-apps-aks-dev.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/aks-dev
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-aks-prod.yaml
+++ b/_app-of-apps-aks-prod.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/aks-prod
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-eks-prod.yaml
+++ b/_app-of-apps-eks-prod.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/eks-prod
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-gke-prod.yaml
+++ b/_app-of-apps-gke-prod.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/gke-prod
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-upc-dev.yaml
+++ b/_app-of-apps-upc-dev.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/upc-dev
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-upc-prod.yaml
+++ b/_app-of-apps-upc-prod.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/upc-prod
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-gke-dev.yaml
+++ b/_app-of-apps-gke-dev.yaml
@@ -20,7 +20,7 @@ spec:
  source:
    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
-    path: infra/overlays/gke-dev
+    path: infra
  destination:
    server: https://kubernetes.default.svc
    namespace: default
--- a/apps/base/argo-mcp.yaml
+++ b/apps/base/argo-mcp.yaml
--- a/apps/base/kustomization.yaml
+++ b/apps/base/kustomization.yaml
@@ -1,8 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- dot-ai-stack.yaml
- mcp10x.yaml
- musicman.yaml
- ts-mcp.yaml
- argo-mcp.yaml
--- a/apps/base/ts-mcp.yaml
+++ b/apps/base/ts-mcp.yaml
@@ -1,40 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ts-mcp
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "11"
-    notifications.argoproj.io/subscribe.on-sync-succeeded.slack: ""
-    notifications.argoproj.io/subscribe.on-sync-failed.slack: ""
-    notifications.argoproj.io/subscribe.on-degraded.slack: ""
-  labels:
-    app.kubernetes.io/name: ts-mcp
-    app.kubernetes.io/part-of: apps
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  sources:
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/forte-helm.git
-    path: forteapp
-    targetRevision: HEAD
-    helm:
-      valueFiles:
-      - $values/ts-mcp/values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/helm-prod-values.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: ts-mcp
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/apps/base/dot-ai-stack.yaml
+++ b/apps/base/dot-ai-stack.yaml
@@ -27,19 +27,29 @@ metadata:
 spec:
  project: default

-  sources:
-  - repoURL: ghcr.io/vfarcic/dot-ai-stack/charts
+  source:
+    repoURL: ghcr.io/vfarcic/dot-ai-stack/charts
    chart: dot-ai-stack
    targetRevision: "0.56.0"
+
    helm:
      releaseName: dot-ai-stack
-      valueFiles:
-      - $values/infra/values/base/dot-ai-stack-values.yaml
-      - $values/infra/values/upc-dev/dot-ai-stack-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
+      values: |
+        dot-ai:
+          ingress:
+            enabled: true
+            className: traefik
+            host: kubemcp.forteapps.net
+          webUI:
+            baseUrl: http://kubemcpui.forteapps.net
+        dot-ai-ui:
+          uiAuth:
+            secretRef:
+              name: dot-ai-secrets
+          ingress:
+            enabled: true
+            className: traefik
+            host: kubemcpui.forteapps.net

  destination:
    server: https://kubernetes.default.svc
--- a/apps/base/mcp10x.yaml
+++ b/apps/base/mcp10x.yaml
--- a/apps/base/musicman.yaml
+++ b/apps/base/musicman.yaml
--- a/apps/overlays/upc-dev/kustomization.yaml
+++ b/apps/overlays/upc-dev/kustomization.yaml
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-# No patches needed — base already has "upc-dev" paths
-# upc-dev is the default/base cluster
--- a/apps/overlays/upc-prod/kustomization.yaml
+++ b/apps/overlays/upc-prod/kustomization.yaml
@@ -1,14 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# dot-ai-stack: swap upc-dev → upc-prod
- target:
-    kind: Application
-    name: dot-ai-stack
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/dot-ai-stack-values.yaml
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,16 +1,8 @@
 #!/bin/zsh
-
 # 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|aks-dev|aks-prod|eks-dev|eks-prod|gke-dev|gke-prod)}"
-
-echo "running $0 for cluster: ${CLUSTER}..."
-
-# Source cluster config
-eval $(yq -r 'to_entries[] | "export \(.key)=\"\(.value)\""' "clusters/${CLUSTER}.yaml")
-
-echo "Bootstrapping cluster: ${clusterName} (${CLUSTER})..."
+echo "running $0..."

 ############################################################
 # Bootstrap                                                     #
@@ -18,18 +10,18 @@ echo "Bootstrapping cluster: ${clusterName} (${CLUSTER})..."
 Bootstrap()
 {
    ArgoCd
-#    Gitea
+#    Github
 }


 ############################################################
-# Gitea                                                     #
+# Github                                                     #
 ############################################################
-Gitea()
+Github()
 {
    echo "Installing secret..."
-    kubectl apply -f "private/${CLUSTER}/gitea-repo-main.yaml"
-    kubectl apply -f "private/${CLUSTER}/main.key"
+    kubectl apply -f private/github.yaml
+    kubectl apply -f private/main.key
 }

 ############################################################
@@ -37,22 +29,17 @@ Gitea()
 ############################################################
 ArgoCd()
 {
-    # Pre-create ConfigMap for repo-server env (must exist before Helm upgrade)
-    kubectl create namespace argocd --dry-run=client -o yaml | kubectl apply -f -
-    kubectl apply -f cluster-resources/argocd-repo-server-config.yaml
-
    # install argocd
    echo "Installing ArgoCD..."
+    CLUSTER_NAME="${CLUSTER_NAME:-dev-fd-no-svg1}"
    helm upgrade --install argocd argo-cd \
            --repo https://argoproj.github.io/argo-helm \
-            --version "7.8.0" \
            --namespace argocd --create-namespace \
-            --values infra/values/base/argocd-values.yaml \
-            --values "infra/values/${CLUSTER}/argocd-values.yaml" \
-            --set notifications.context.clusterName="${clusterName}" \
+            --values infra/values/argocd-values.yaml \
+            --set notifications.context.clusterName="$CLUSTER_NAME" \
            --timeout 60s --atomic

-    kubectl apply -f "_app-of-apps-${CLUSTER}.yaml" -n argocd
+    kubectl apply -f _app-of-apps.yaml -n argocd
 }

 Bootstrap
--- a/cluster-resources/argocd-oidc-secret-sync.yaml
+++ b/cluster-resources/argocd-oidc-secret-sync.yaml
@@ -1,83 +0,0 @@
-# CronJob: syncs OIDC client secret from registrar-managed
-# argocd-oidc-credentials into argocd-secret (oidc.clientSecret key).
-# Runs every 2 min. No-ops if source secret doesn't exist yet
-# (safe for fresh deploys before Keycloak is up).
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
-rules:
- apiGroups: [""]
-  resources: ["secrets"]
-  resourceNames: ["argocd-oidc-credentials", "argocd-secret"]
-  verbs: ["get", "patch"]
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: argocd-oidc-sync
-subjects:
- kind: ServiceAccount
-  name: argocd-oidc-sync
-  namespace: argocd
---
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
-spec:
-  schedule: "*/2 * * * *"
-  concurrencyPolicy: Forbid
-  successfulJobsHistoryLimit: 1
-  failedJobsHistoryLimit: 3
-  jobTemplate:
-    spec:
-      backoffLimit: 1
-      template:
-        spec:
-          serviceAccountName: argocd-oidc-sync
-          restartPolicy: Never
-          containers:
-          - name: sync
-            image: bitnami/kubectl:latest
-            command: ["/bin/sh", "-c"]
-            args:
-            - |
-              set -e
-
-              # Exit gracefully if source secret doesn't exist yet
-              if ! kubectl get secret argocd-oidc-credentials -n argocd >/dev/null 2>&1; then
-                echo "argocd-oidc-credentials not found — skipping (Keycloak not ready yet)"
-                exit 0
-              fi
-
-              # Read current OIDC client secret
-              NEW_SECRET=$(kubectl get secret argocd-oidc-credentials -n argocd \
-                -o jsonpath='{.data.client-secret}' | base64 -d)
-
-              # Read current value in argocd-secret (if any)
-              CURRENT=$(kubectl get secret argocd-secret -n argocd \
-                -o jsonpath='{.data.oidc\.clientSecret}' 2>/dev/null | base64 -d || echo "")
-
-              # Only patch if changed
-              if [ "$NEW_SECRET" = "$CURRENT" ]; then
-                echo "oidc.clientSecret already up to date"
-                exit 0
-              fi
-
-              kubectl patch secret argocd-secret -n argocd --type merge \
-                -p "{\"stringData\":{\"oidc.clientSecret\":\"${NEW_SECRET}\"}}"
-              echo "Patched argocd-secret with oidc.clientSecret"
--- a/cluster-resources/argocd-repo-server-config.yaml
+++ b/cluster-resources/argocd-repo-server-config.yaml
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: argocd-repo-server-config
-  namespace: argocd
-data:
-  # Disable git submodule checkout - submodules (e.g. shared-prompts)
-  # are not needed for K8s manifest generation
-  ARGOCD_GIT_MODULES_ENABLED: "false"
--- a/cluster-resources/gitea-backup-cronjob.yaml
+++ b/cluster-resources/gitea-backup-cronjob.yaml
@@ -57,17 +57,17 @@ spec:
                - sh
                - -c
                - |
-                  mc alias set s3 "${S3_ENDPOINT}" "${AWS_ACCESS_KEY_ID}" "${AWS_SECRET_ACCESS_KEY}"
+                  mc alias set upcloud "${S3_ENDPOINT}" "${AWS_ACCESS_KEY_ID}" "${AWS_SECRET_ACCESS_KEY}"

                  TIMESTAMP=$(date +%Y%m%d-%H%M%S)
                  KEY="gitea-dump-${TIMESTAMP}.zip"
                  echo "Uploading ${KEY}..."
-                  mc cp /backup/gitea-dump.zip "s3/${S3_BUCKET}/${KEY}" && \
+                  mc cp /backup/gitea-dump.zip "upcloud/${S3_BUCKET}/${KEY}" && \
                  echo "Upload complete."

                  # Prune backups older than 7 days
                  echo "Pruning backups older than 7 days..."
-                  mc rm --older-than 7d --force "s3/${S3_BUCKET}/" 2>&1 || true
+                  mc rm --older-than 7d --force "upcloud/${S3_BUCKET}/" 2>&1 || true
                  echo "Pruning complete."
              envFrom:
                - secretRef:
--- a/cluster-resources/policies/auth-sidecar-injector.yaml
+++ b/cluster-resources/policies/auth-sidecar-injector.yaml
@@ -243,8 +243,8 @@ spec:
            - name: AUTH_OIDC_CLIENT_SECRET
              valueFrom:
                secretKeyRef:
-                  name: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-credentials-secret\" || 'auth-oidc' }}"
-                  key: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-credentials-secret-key\" || 'client-secret' }}"
+                  name: auth-oidc
+                  key: client-secret
            resources:
              limits:
                cpu: 50m
@@ -410,8 +410,8 @@ spec:
            - name: AUTH_OAUTH_CLIENT_SECRET
              valueFrom:
                secretKeyRef:
-                  name: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oauth-credentials-secret\" || 'auth-oauth' }}"
-                  key: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oauth-credentials-secret-key\" || 'client-secret' }}"
+                  name: auth-oauth
+                  key: client-secret
            - name: AUTH_OAUTH_DELEGATION_CLIENT_SECRET
              valueFrom:
                secretKeyRef:
--- a/cluster-resources/policies/keycloak-client-cloner.yaml
+++ b/cluster-resources/policies/keycloak-client-cloner.yaml
@@ -1,37 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: keycloak-client-config-cloner
-spec:
-  rules:
-  - name: clone-client-config-to-keycloak
-    skipBackgroundRequests: false
-    match:
-      any:
-      - resources:
-          kinds:
-          - Secret
-          selector:
-            matchLabels:
-              keycloak.forteapps.net/client-config: "true"
-    exclude:
-      any:
-      - resources:
-          namespaces:
-          - keycloak
-    generate:
-      apiVersion: v1
-      kind: Secret
-      name: "{{request.object.metadata.name}}"
-      namespace: keycloak
-      synchronize: true
-      data:
-        metadata:
-          labels:
-            keycloak.forteapps.net/client-config: "true"
-            keycloak.forteapps.net/source-namespace: "{{request.object.metadata.namespace}}"
-          annotations:
-            keycloak.forteapps.net/source-name: "{{request.object.metadata.name}}"
-            keycloak.forteapps.net/source-namespace: "{{request.object.metadata.namespace}}"
-        data: "{{request.object.data}}"
-        type: "{{request.object.type}}"
--- a/cluster-resources/policies/label-checker.yaml
+++ b/cluster-resources/policies/label-checker.yaml
@@ -26,6 +26,7 @@ spec:
          - monitoring
          - secrets
          - kyverno
+          - trivy-system
    match:
      any:
      - resources:
--- a/cluster-resources/policies/secret-cloner.yaml
+++ b/cluster-resources/policies/secret-cloner.yaml
@@ -16,6 +16,7 @@ spec:
      - resources:
          namespaces:
          - kube-system
+          - trivy-system
          - monitoring
          - argocd
          - cert-manager
--- a/clusters/aks-dev.yaml
+++ b/clusters/aks-dev.yaml
@@ -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: dev-aks                     # → infra/values/aks-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/aks-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/aks-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/aks-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/aks-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/aks-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,168.63.129.16/32" # → infra/values/aks-dev/traefik-values.yaml (ports.*.trustedIPs) — VNet CIDR + Azure health probe
-cloudProvider: azure                     # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/aks-prod.yaml
+++ b/clusters/aks-prod.yaml
@@ -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-aks                    # → infra/values/aks-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/aks-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/aks-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/aks-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/aks-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/aks-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,168.63.129.16/32" # → infra/values/aks-prod/traefik-values.yaml (ports.*.trustedIPs) — VNet CIDR + Azure health probe
-cloudProvider: azure                     # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/eks-dev.yaml
+++ b/clusters/eks-dev.yaml
@@ -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: dev-eks                     # → infra/values/eks-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/eks-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/eks-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/eks-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/eks-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/eks-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8"                # → infra/values/eks-dev/traefik-values.yaml (ports.*.trustedIPs) — VPC CIDR
-cloudProvider: eks                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/eks-prod.yaml
+++ b/clusters/eks-prod.yaml
@@ -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-eks                    # → infra/values/eks-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/eks-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/eks-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/eks-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/eks-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/eks-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8"                # → infra/values/eks-prod/traefik-values.yaml (ports.*.trustedIPs) — VPC CIDR
-cloudProvider: eks                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/gke-dev.yaml
+++ b/clusters/gke-dev.yaml
@@ -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: dev-gke                     # → infra/values/gke-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/gke-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/gke-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/gke-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/gke-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/gke-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22" # → infra/values/gke-dev/traefik-values.yaml (ports.*.trustedIPs) — subnet + GCP health checks
-cloudProvider: gke                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/gke-prod.yaml
+++ b/clusters/gke-prod.yaml
@@ -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-gke                    # → infra/values/gke-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/gke-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/gke-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/gke-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/gke-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/gke-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22" # → infra/values/gke-prod/traefik-values.yaml (ports.*.trustedIPs) — subnet + GCP health checks
-cloudProvider: gke                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/upc-dev.yaml
+++ b/clusters/upc-dev.yaml
@@ -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: dev-fd-no-svg1              # → infra/values/upc-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: forteapps.net                    # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/upc-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.forteapps.net     # → infra/values/upc-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.forteapps.net         # → infra/values/upc-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.forteapps.net       # → infra/values/upc-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host)
-dotaiUiDomain: kubemcpui.forteapps.net   # → infra/values/upc-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
-letsencryptEmail: danijels@gmail.com     # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "172.16.1.0/24"             # → infra/values/upc-dev/traefik-values.yaml (ports.*.trustedIPs)
-cloudProvider: upcloud                   # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/upc-prod.yaml
+++ b/clusters/upc-prod.yaml
@@ -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/upc-prod/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-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.fortedigital.com  # → infra/values/upc-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.fortedigital.com      # → infra/values/upc-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.fortedigital.com    # → infra/values/upc-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host)
-dotaiUiDomain: kubemcpui.fortedigital.com # → infra/values/upc-prod/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-prod/traefik-values.yaml (ports.*.trustedIPs)
-cloudProvider: upcloud                   # → determines overlay directory and cloud-specific LB/storage annotations
--- a/devbox.json
+++ b/devbox.json
@@ -1,32 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.16.0/.schema/devbox.schema.json",
-  "packages": [
-    "kubectl@1.33.2",
-    "kubernetes-helm@3.18.4",
-    "k9s@0.50.7",
-    "kubeseal@0.30.0",
-    "argocd@2.14.11",
-    "kubecm@0.33.1",
-    "kubectl-tree@0.4.3",
-    "kind@0.29.0",
-    "kustomize@5.7.0",
-    "kyverno@1.14.3",
-    "syft@1.29.0",
-    "grype@0.92.2",
-    "traefik@3.6.7",
-    "claude-code@latest",
-    "go@latest",
-    "dotnet-sdk@latest",
-    "opentofu@1.11.6"
-  ],
-  "shell": {
-    "init_hook": [
-      "echo 'Welcome to devbox!' > /dev/null"
-    ],
-    "scripts": {
-      "test": [
-        "echo \"Error: no test specified\" && exit 1"
-      ]
-    }
-  }
-}
--- a/docs/DEVELOPER-GUIDE.md
+++ b/docs/DEVELOPER-GUIDE.md
@@ -9,7 +9,6 @@
 - [Updating an Existing Application](#updating-an-existing-application)
 - [Working with Secrets](#working-with-secrets)
 - [Enabling Authentication for Applications](#enabling-authentication-for-applications)
- [Adding a New Keycloak Client](#adding-a-new-keycloak-client)
 - [Troubleshooting](#troubleshooting)
 - [Best Practices](#best-practices)

@@ -96,10 +95,10 @@ You'll need read/write access to these repositories:
   cd launchpad
   ```

-2. **helm-prod-values** (Values repo)
+2. **helm-values** (Values repo)
   ```bash
   git clone https://git.forteapps.net/Forte/helm-prod-values.git
-   cd helm-prod-values
+   cd helm-values
   ```

 3. **forte-helm** (Chart repo - read-only for most developers)
@@ -175,13 +174,13 @@ npm run dev
 │  - GitHub Actions builds image                                  │
 │  - Pushes to container registry (GHCR, Docker Hub)              │
 │  - Tags with version (e.g., v2.0.4)                             │
-│  - Updates helm-prod-values repository with new tag                  │
+│  - Updates helm-values repository with new tag                  │
 └─────────────────────────────────────────────────────────────────┘
                            │
                            ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │  Step 3: GitOps Sync (Automated)                                │
-│  - ArgoCD detects change in helm-prod-values                         │
+│  - ArgoCD detects change in helm-values                         │
 │  - Pulls updated configuration                                  │
 │  - Syncs to Kubernetes cluster                                  │
 │  - Sends Slack notification on success/failure                  │
@@ -201,7 +200,7 @@ Our setup uses three repositories:
 | Repository | Purpose | Who Edits | How Often |
 |------------|---------|-----------|-----------|
 | **forte-helm** | Helm chart templates (generic, reusable) | Platform engineers | ❌ Rarely |
-| **helm-prod-values** | Application configuration (image tag, env vars) | Developers / CI pipelines | ✅ Sometimes |
+| **helm-values** | Application configuration (image tag, env vars) | Developers / CI pipelines | ✅ Sometimes |
 | **launchpad** | ArgoCD Applications (what gets deployed) | Platform / DevOps engineers | ✅ Per new app |

 ### Example: Deploying "myapp"
@@ -223,7 +222,7 @@ spec:
      value: {{ .Values.app.port }}
 ```

-#### Repository: `helm-prod-values` (Your App Config)
+#### Repository: `helm-values` (Your App Config)
 ```yaml
 # myapp/values.yaml
 # Your app's specific configuration
@@ -248,13 +247,13 @@ metadata:
  namespace: argocd
 spec:
  sources:
-  - repoURL: https://git.forteapps.net/Forte/forte-helm
+  - repoURL: https://github.com/fortedigital/forte-helm
    path: forteapp
    helm:
      valueFiles:
      - $values/myapp/values.yaml

-  - repoURL: git@github.com:fortedigital/helm-prod-values.git
+  - repoURL: git@github.com:fortedigital/helm-values.git
    ref: values

  destination:
@@ -316,10 +315,10 @@ Ensure your app repository has:
             docker build -t ghcr.io/fortedigital/hello-world:${{ steps.version.outputs.VERSION }} .
             docker push ghcr.io/fortedigital/hello-world:${{ steps.version.outputs.VERSION }}

-         - name: Update helm-prod-values
+         - name: Update helm-values
           run: |
-             git clone git@github.com:fortedigital/helm-prod-values.git
-             cd helm-prod-values
+             git clone git@github.com:fortedigital/helm-values.git
+             cd helm-values
             mkdir -p hello-world
             cat > hello-world/values.yaml <<EOF
             app:
@@ -334,7 +333,7 @@ Ensure your app repository has:

 ### Step 2: Create Helm Values

-Create a folder in `helm-prod-values` repository:
+Create a folder in `helm-values` repository:

 ```bash
 cd ~/dev/k8s/helm-prod-values
@@ -412,7 +411,7 @@ spec:

  sources:
  # Source 1: Helm chart templates
-  - repoURL: https://git.forteapps.net/Forte/forte-helm
+  - repoURL: https://github.com/fortedigital/forte-helm
    path: forteapp
    targetRevision: HEAD
    helm:
@@ -420,7 +419,7 @@ spec:
      - $values/hello-world/values.yaml

  # Source 2: Helm values
-  - repoURL: git@github.com:fortedigital/helm-prod-values.git
+  - repoURL: git@github.com:fortedigital/helm-values.git
    targetRevision: HEAD
    ref: values

@@ -528,7 +527,7 @@ git push origin main
 2. ✅ Builds new Docker image
 3. ✅ Tags with new version (e.g., `v20260316-143022`)
 4. ✅ Pushes to container registry
-5. ✅ Updates `helm-prod-values/myapp/values.yaml` with new tag
+5. ✅ Updates `helm-values/myapp/values.yaml` with new tag
 6. ✅ ArgoCD detects change
 7. ✅ Syncs new version to cluster
 8. ✅ Sends Slack notification
@@ -654,11 +653,21 @@ kubectl create secret generic myapp-credentials \

 #### Step 2: Seal the Secret

+Get the public certificate (one-time setup):
+
+```bash
+# Fetch public cert from cluster
+kubeseal --fetch-cert \
+  --controller-name=sealed-secrets-controller \
+  --controller-namespace=kube-system \
+  > pub-cert.pem
+```
+
 Seal your secret:

 ```bash
 kubeseal --format=yaml \
-  --namespace=myapp \
+  --cert=pub-cert.pem \
  < private/myapp-credentials.yaml \
  > secrets/myapp-credentials-sealed.yaml
 ```
@@ -673,7 +682,7 @@ git push

 #### Step 4: Reference Secret in Application

-Update your `helm-prod-values/myapp/values.yaml`:
+Update your `helm-values/myapp/values.yaml`:

 ```yaml
 app:
@@ -701,7 +710,7 @@ kubectl create secret generic myapp-credentials \

 # 2. Seal it
 kubeseal --format=yaml \
-  --namespace=myapp \
+  --cert=pub-cert.pem \
  < private/myapp-credentials.yaml \
  > secrets/myapp-credentials-sealed.yaml

@@ -781,7 +790,7 @@ Three authentication modes are supported:
 #### Step 1: Configure Helm Values

 ```yaml
-# In helm-prod-values/myapp/values.yaml
+# In helm-values/myapp/values.yaml
 auth:
  enabled: true
  type: token                    # Token mode (default)
@@ -903,7 +912,7 @@ rm private/myapp-auth-oidc.yaml
 #### Step 3: Configure Helm Values

 ```yaml
-# In helm-prod-values/myapp/values.yaml
+# In helm-values/myapp/values.yaml
 auth:
  enabled: true
  type: oidc                     # OIDC mode
@@ -952,46 +961,6 @@ User sees application (authenticated)

 ---

-### Accessing Authenticated User Information
-
-The auth sidecar handles all authentication before requests reach your application. Your app never sees unauthenticated traffic — the sidecar returns 401 or redirects to the IdP first.
-
-After successful authentication, the sidecar forwards the request to your application with user identity injected as HTTP headers:
-
-| Header | Description | Available in |
-|--------|-------------|-------------|
-| `X-Auth-User` | Username or display name | Token, OIDC, MCP |
-| `X-Auth-Email` | User email address | OIDC |
-| `X-Auth-Subject` | OIDC `sub` claim (stable user ID) | OIDC, MCP |
-| `X-Auth-Groups` | Comma-separated group memberships | OIDC (if scope includes `groups`) |
-| `X-Auth-Token` | The validated access token | All modes |
-
-**Your application reads these headers — no auth library needed:**
-
-```javascript
-// Express.js example
-app.get('/profile', (req, res) => {
-  const user = req.headers['x-auth-user'];
-  const email = req.headers['x-auth-email'];
-  res.json({ user, email });
-});
-```
-
-```python
-# Flask example
-@app.route('/profile')
-def profile():
-    user = request.headers.get('X-Auth-User')
-    email = request.headers.get('X-Auth-Email')
-    return jsonify(user=user, email=email)
-```
-
-**Why this is safe**: The Kyverno-generated NetworkPolicy restricts ingress to the sidecar port only. Traffic cannot bypass the sidecar to reach the application port directly, so the `X-Auth-*` headers can be trusted unconditionally.
-
-**Key principle**: Your application is zero-trust-unaware by design. It reads headers and renders UI. All authentication complexity lives in the sidecar and Kyverno policy.
-
---
-
 ### Authentication Configuration Reference

 #### Helm Values Schema
@@ -1079,7 +1048,7 @@ policies.forteapps.io/auth-image-version: "v1.2.3"
 #### Example 1: Internal API with Token Auth

 ```yaml
-# helm-prod-values/internal-api/values.yaml
+# helm-values/internal-api/values.yaml
 app:
  image:
    repository: ghcr.io/company/internal-api
@@ -1107,7 +1076,7 @@ curl -H "Authorization: Bearer d4f88f..." \
 #### Example 2: User-Facing App with OIDC

 ```yaml
-# helm-prod-values/web-app/values.yaml
+# helm-values/web-app/values.yaml
 app:
  image:
    repository: ghcr.io/company/web-app
@@ -1142,7 +1111,7 @@ kubectl create secret generic auth-oidc \
 #### Example 3: MCP Server with OAuth 2.0

 ```yaml
-# helm-prod-values/mcp-server/values.yaml
+# helm-values/mcp-server/values.yaml
 app:
  image:
    repository: ghcr.io/company/mcp-server
@@ -1166,7 +1135,7 @@ The MCP auth mode implements RFC 9728 (OAuth 2.0 Protected Resource Metadata) fo
 #### Example 4: Disabling Authentication

 ```yaml
-# helm-prod-values/public-api/values.yaml
+# helm-values/public-api/values.yaml
 auth:
  enabled: false                 # No authentication

@@ -1278,202 +1247,6 @@ kubectl logs -n myapp <pod-name> -c authn

 ---

-## Adding a New Keycloak Client
-
-There are two ways to add an OIDC client, depending on your use case:
-
-| Method | Best for | Who edits the infra repo? |
-|--------|----------|--------------------------|
-| **Self-service** (recommended) | New apps that deploy their own resources | App developer — no infra changes needed |
-| **Legacy (realm JSON)** | Existing clients already defined in forte-realm.json (e.g., Gitea) | Platform engineer |
-
-Both methods are served by the **Keycloak Client Registrar** CronJob, which runs every 2 minutes.
-
-### Self-Service OIDC Client Registration
-
-This is the recommended flow for new applications. Your app deploys a labeled config Secret in its own namespace; the platform handles everything else.
-
-#### How It Works
-
-1. You deploy a Secret with label `keycloak.forteapps.net/client-config: "true"` containing a `client.json` definition
-2. A **Kyverno ClusterPolicy** (`keycloak-client-config-cloner`) clones it to the `keycloak` namespace
-3. The **Client Registrar CronJob** picks it up within 2 minutes:
-   - Registers (or updates) the client in Keycloak
-   - Fetches the auto-generated client secret
-   - Creates a credential Secret in your app's namespace
-   - Annotates the config Secret with sync status
-
-#### Step 1: Create the Config Secret
-
-Deploy this Secret in your application's namespace (e.g., as part of your Helm chart or Kustomize overlay):
-
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: keycloak-client-myapp
-  namespace: myapp
-  labels:
-    keycloak.forteapps.net/client-config: "true"
-stringData:
-  client.json: |
-    {
-      "clientId": "myapp",
-      "name": "My Application",
-      "redirectUris": ["https://myapp.forteapps.net/*"],
-      "webOrigins": ["https://myapp.forteapps.net"],
-      "defaultClientScopes": ["openid", "email", "profile"],
-      "protocolMappers": [],
-      "secret": {
-        "namespace": "myapp",
-        "name": "myapp-oidc-credentials",
-        "keys": { "clientId": "client-id", "clientSecret": "client-secret" }
-      }
-    }
-```
-
-**`client.json` fields**:
-
-| Field | Required | Description |
-|-------|----------|-------------|
-| `clientId` | Yes | Keycloak client ID |
-| `name` | Yes | Display name in Keycloak |
-| `redirectUris` | Yes | Allowed redirect URIs |
-| `webOrigins` | Yes | Allowed web origins (CORS) |
-| `defaultClientScopes` | No | Scopes (default: `["openid", "email", "profile"]`) |
-| `protocolMappers` | No | Custom claim mappers (default: `[]`) |
-| `secret.namespace` | No | Namespace for the credential Secret (default: source namespace) |
-| `secret.name` | No | Name of the credential Secret (default: `<clientId>-oidc-credentials`) |
-| `secret.keys.clientId` | No | Key name for client ID in credential Secret (default: `client-id`) |
-| `secret.keys.clientSecret` | No | Key name for client secret in credential Secret (default: `client-secret`) |
-
-#### Step 2: Reference the Credential Secret
-
-In your application's deployment config, reference the credential Secret that the registrar creates:
-
-```yaml
-env:
- name: OIDC_CLIENT_ID
-  valueFrom:
-    secretKeyRef:
-      name: myapp-oidc-credentials
-      key: client-id
- name: OIDC_CLIENT_SECRET
-  valueFrom:
-    secretKeyRef:
-      name: myapp-oidc-credentials
-      key: client-secret
-```
-
-#### Step 3: Deploy and Wait
-
-Commit and push your changes. The credential Secret will appear within 2 minutes:
-
-```bash
-# Watch for the credential Secret to be created
-kubectl get secret myapp-oidc-credentials -n myapp -w
-
-# Check registrar logs
-kubectl logs -n keycloak job/$(kubectl get jobs -n keycloak --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}')
-
-# Check sync status on the config Secret
-kubectl get secret keycloak-client-myapp -n keycloak -o jsonpath='{.metadata.annotations}'
-```
-
-#### Change Detection
-
-The registrar computes a SHA-256 hash of `client.json` and stores it as an annotation. On subsequent runs, it skips processing if:
- The hash hasn't changed, AND
- The credential Secret already exists in the target namespace
-
-To force a re-sync, update any field in `client.json` (e.g., add a trailing space to `name`).
-
-### Legacy Method: Realm JSON
-
-Existing clients (like Gitea) are defined directly in `forte-realm.json` inside `keycloak-values.yaml`. The registrar syncs their secrets via client attributes.
-
-#### Step 1: Add Client to Realm Config
-
-In `infra/values/base/keycloak-values.yaml`, add a new entry to the `clients` array in `forte-realm.json`:
-
-```json
-{
-  "clientId": "myapp",
-  "name": "My Application",
-  "enabled": true,
-  "protocol": "openid-connect",
-  "clientAuthenticatorType": "client-secret",
-  "standardFlowEnabled": true,
-  "directAccessGrantsEnabled": false,
-  "publicClient": false,
-  "redirectUris": ["https://myapp.forteapps.net/*"],
-  "webOrigins": ["https://myapp.forteapps.net"],
-  "defaultClientScopes": ["openid", "email", "profile"],
-  "attributes": {
-    "k8s.secret.sync": "true",
-    "k8s.secret.namespace": "myapp",
-    "k8s.secret.name": "myapp-oidc-credentials",
-    "k8s.secret.client-id-key": "key",
-    "k8s.secret.client-secret-key": "secret"
-  }
-}
-```
-
-**Important**:
- Do **NOT** include a `"secret"` field — Keycloak generates one automatically
- The `attributes` block tells the registrar where to create the K8s Secret
- Set `client-id-key` / `client-secret-key` to match what the consuming app expects (defaults: `client-id` / `client-secret`)
-
-#### Step 2: Reference the Secret in Your Application
-
-```yaml
-existingSecret: myapp-oidc-credentials
-```
-
-#### Step 3: Commit and Push
-
-```bash
-cd ~/dev/k8s/launchpad
-git add infra/values/base/keycloak-values.yaml
-git commit -m "Add myapp Keycloak client with auto-sync"
-git push
-```
-
-ArgoCD will sync the Keycloak config, and the registrar CronJob will pick up the new client within 2 minutes.
-
-#### Legacy Sync Attribute Reference
-
-| Attribute | Required | Default | Description |
-|-----------|----------|---------|-------------|
-| `k8s.secret.sync` | Yes | — | Set to `"true"` to enable syncing |
-| `k8s.secret.namespace` | Yes | — | Target K8s namespace for the secret |
-| `k8s.secret.name` | Yes | — | Name of the K8s Secret to create |
-| `k8s.secret.client-id-key` | No | `client-id` | Field name for the client ID in the K8s Secret |
-| `k8s.secret.client-secret-key` | No | `client-secret` | Field name for the client secret in the K8s Secret |
-
-### Retrieving Secrets for External Deployments
-
-The registrar always writes a **central copy** of every synced secret to the `secrets` namespace, in addition to the target namespace. This allows operators to retrieve client credentials for applications deployed outside this cluster:
-
-```bash
-# View the central copy
-kubectl get secret gitea-oidc-credentials -n secrets -o yaml
-
-# Extract the client secret for use elsewhere
-kubectl get secret myapp-oidc-credentials -n secrets \
-  -o jsonpath='{.data.client-secret}' | base64 -d
-```
-
-### Registrar Behavior Notes
-
- The registrar runs as a CronJob every 2 minutes (`concurrencyPolicy: Forbid`)
- If the target namespace doesn't exist, the target write is skipped with a warning (the central copy still happens)
- A central copy is **always** written to the `secrets` namespace for every synced client
- The registrar uses the `keycloak-credentials` secret for admin authentication
- Created secrets have the label `app.kubernetes.io/managed-by: keycloak-client-registrar`
-
---
-
 ## Troubleshooting

 ### Application Not Deploying
@@ -1530,7 +1303,7 @@ kubectl exec -n myapp <pod-name> -- env
 # Check if secrets exist
 kubectl get secrets -n myapp

-# Increase resources in helm-prod-values
+# Increase resources in helm-values
 vim ~/dev/k8s/helm-prod-values/myapp/values.yaml
 ```

@@ -1679,7 +1452,7 @@ If you're stuck:
 ### Configuration Management

 ✅ **DO**:
- Keep configuration in `helm-prod-values` repository
+- Keep configuration in `helm-values` repository
 - Use environment variables for config
 - Document what each value does
 - Use reasonable resource limits
@@ -1806,4 +1579,4 @@ Now that you understand the basics:
 - Docs: [Full documentation index](README.md)
 - Help: Contact platform team

-**Last Updated**: 2026-04-16
+**Last Updated**: 2026-03-16
--- a/docs/GITOPS-ARCHITECTURE.md
+++ b/docs/GITOPS-ARCHITECTURE.md
@@ -12,11 +12,11 @@

 ## Overview

-This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where Git repositories serve as the single source of truth for both infrastructure and application deployments. The cluster setup is **cloud-agnostic**, with ready-to-use configurations for **UpCloud**, **AWS EKS**, **Azure AKS**, and **GCP GKE**.
+This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where Git repositories serve as the single source of truth for both infrastructure and application deployments. The cluster is running on **UpCloud Managed Kubernetes** but is designed to be cloud-agnostic.

 ### Key Characteristics
 - **Environment**: Production (internal use only)
- **Cluster Type**: Multi-cloud, multi-cluster via Kustomize overlays (UpCloud, AWS, Azure, GCP)
+- **Cluster Type**: Single cluster, single environment
 - **GitOps Tool**: ArgoCD
 - **Deployment Pattern**: App-of-Apps
 - **Secret Management**: Sealed Secrets (kubeseal)
@@ -47,7 +47,7 @@ This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where
         │                            │                          │
         │                            │                          │
         └────────► Update image tag ─┴──────────────────────────┘
-                    in helm-prod-values                               │
+                    in helm-values                               │
                                                                 │
                                                                 ▼
                                           ┌────────────────────────────────┐
@@ -62,8 +62,8 @@ This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where
                                                        │
                                                        ▼
                                           ┌────────────────────────────────┐
-                                           │   Kubernetes Clusters          │
-                                           │   (UpCloud, AWS, Azure, GCP)    │
+                                           │   Kubernetes Cluster           │
+                                           │   (UpCloud Managed)            │
                                           │                                │
                                           │  ┌──────────────────────────┐  │
                                           │  │    ArgoCD                │  │
@@ -116,71 +116,81 @@ This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where
 ```
 launchpad/
 ├── bootstrap.sh                      # Cluster initialization script
-├── _app-of-apps-upc-dev.yaml        # Root ArgoCD Application (upc-dev cluster)
-├── _app-of-apps-upc-prod.yaml       # Root ArgoCD Application (upc-prod cluster)
+├── _app-of-apps.yaml                 # Root ArgoCD Application (App-of-Apps pattern)
 │
-├── infra/                            # Infrastructure ArgoCD Applications (Kustomize)
-│   ├── base/                         # Base Application manifests (upc-dev defaults)
-│   │   ├── kustomization.yaml
-│   │   ├── traefik-application.yaml
-│   │   ├── keycloak.yaml
-│   │   ├── grafana.yaml
-│   │   ├── gitea.yaml
-│   │   ├── gitea-actions.yaml
-│   │   ├── tempo.yaml
-│   │   ├── renovate.yaml
-│   │   ├── ...                       # All other Application manifests
-│   │   └── secrets.yaml
-│   ├── overlays/                     # Per-cluster Kustomize overrides
-│   │   ├── upc-dev/                  # UpCloud Dev (uses base as-is)
-│   │   ├── upc-prod/                # UpCloud Prod (patches value paths)
-│   │   ├── eks-dev/                  # AWS EKS Dev
-│   │   ├── eks-prod/                # AWS EKS Prod
-│   │   ├── aks-dev/               # Azure AKS Dev
-│   │   ├── aks-prod/              # Azure AKS Prod
-│   │   ├── gke-dev/                 # GCP GKE Dev
-│   │   └── gke-prod/               # GCP GKE Prod
-│   ├── dashboards/                   # Grafana dashboard ConfigMaps
+├── infra/                            # Infrastructure ArgoCD Applications
+│   ├── enterprise-apps.yaml          # Parent app managing all apps in apps/
+│   ├── cluster-resources-application.yaml
+│   ├── traefik-application.yaml
+│   ├── cert-manager-application.yaml
+│   ├── kyverno.yaml
+│   ├── kyverno-policies.yaml
+│   ├── prometheus.yaml
+│   ├── grafana.yaml
+│   ├── loki.yaml
+│   ├── tempo.yaml
+│   ├── fluent-bit.yaml
+│   ├── trivy.yaml
+│   ├── sealedsecrets.yaml
+│   ├── secrets.yaml
 │   └── values/                       # Helm value overrides for infra
-│       ├── base/                     # Cloud-agnostic shared values
-│       ├── upc-{dev,prod}/           # UpCloud: storage class, LB, pricing
-│       ├── aws-{dev,prod}/           # AWS: gp3, NLB, CUR pricing
-│       ├── aks-{dev,prod}/         # Azure: managed-csi-premium, Standard LB
-│       └── gcp-{dev,prod}/           # GCP: premium-rwo, L4 LB
+│       ├── argocd-values.yaml
+│       ├── prometheus-values.yaml
+│       ├── grafana-values.yaml
+│       ├── loki-values.yaml
+│       ├── tempo-values.yaml
+│       └── fluent-bit-values.yaml
 │
-├── apps/                             # Business Application ArgoCD manifests (Kustomize)
-│   ├── base/                         # Base app manifests
-│   │   ├── kustomization.yaml
-│   │   ├── dot-ai-stack.yaml
-│   │   └── ...
-│   └── overlays/
-│       ├── upc-dev/                  # Uses base as-is
-│       └── upc-prod/                # Patches value paths
+├── apps/                             # Business Application ArgoCD manifests
+│   ├── mcp10x.yaml                   # MCP 10X application
+│   ├── musicman.yaml                 # Music Man application
+│   ├── dot-ai-stack.yaml             # Dot AI Stack
+│   └── argo-mcp.yaml                 # ArgoCD MCP server
 │
 ├── cluster-resources/                # Cluster-wide Kubernetes resources
-│   ├── ...
+│   ├── cert-manager-namespace.yaml
+│   ├── secrets-namespace.yaml
+│   ├── letsencrypt-issuer.yaml       # Let's Encrypt ClusterIssuer
+│   ├── kyverno-config.yaml
+│   ├── argocd-notifications-secret-sealed.yaml
+│   ├── forte10x-repo-credentials-sealed.yaml
+│   ├── mcp10x-repo-credentials-sealed.yaml
 │   └── policies/                     # Kyverno policies
+│       ├── deployment-verifier.yaml
+│       ├── label-checker.yaml
+│       ├── bare-pod-cleaner.yaml
+│       ├── replicaset-cleaner.yaml
+│       ├── default-ns-blocker.yaml
+│       ├── secret-cloner.yaml
+│       └── auth-sidecar-injector.yaml
 │
-├── secrets/                          # Application secrets (sealed, per-cluster)
-│   └── upc-dev/                      # Secrets for upc-dev cluster
+├── secrets/                          # Application secrets (sealed)
+│   ├── argocd-mcp-credentials.yaml
+│   ├── dot-ai-secrets.yaml
+│   ├── mcp10x-credentials-sealed.yaml
+│   └── musicman-credentials.yaml
 │
 ├── private/                          # Local-only files (NOT in Git)
+│   ├── *.yaml                        # Unsealed secrets
+│   └── *.sh                          # Helper scripts
 │
 └── docs/                             # Documentation
+    ├── GITOPS-ARCHITECTURE.md        # This file
+    ├── DEVELOPER-GUIDE.md
+    ├── OPERATIONS-RUNBOOK.md
+    └── REFERENCE.md
 ```

 **Key Points**:
- `_app-of-apps-upc-dev.yaml` and `_app-of-apps-upc-prod.yaml` are the per-cluster root Applications
- Kustomize overlays in `infra/overlays/` render base Applications with per-cluster patches
- Helm values are split: `values/base/` (shared) + `values/upc-dev/` or `values/upc-prod/` (cluster-specific)
- `apps/` follows the same base/overlays pattern for business applications
+- `_app-of-apps.yaml` is the root Application that ArgoCD monitors
+- `infra/enterprise-apps.yaml` auto-discovers all apps in `apps/` folder
 - Changes pushed to this repo trigger automatic syncs in ArgoCD
 - `private/` folder contains local-only files (Git-ignored)

 ---

 ### 2. **Helm Charts Repository**
-**Repository**: `https://git.forteapps.net/Forte/forte-helm`
+**Repository**: `https://github.com/fortedigital/forte-helm`
 **Purpose**: Reusable Helm chart templates for Forte applications
 **Location**: `C:\dev\k8s\forte-helm`

@@ -214,7 +224,7 @@ forte-helm/
 ---

 ### 3. **Helm Values Repository**
-**Repository**: `git@github.com:fortedigital/helm-prod-values.git`
+**Repository**: `git@github.com:fortedigital/helm-values.git`
 **Purpose**: Environment-specific configuration for each application
 **Location**: `C:\dev\k8s\helm-prod-values`

@@ -224,6 +234,8 @@ helm-prod-values/
 │   └── values.yaml                   # MCP 10X configuration
 ├── musicman/
 │   └── values.yaml                   # Music Man configuration
+├── mcpcoder/
+│   └── values.yaml                   # MCP Coder configuration
 └── argocd-mcp/
    └── values.yaml                   # ArgoCD MCP configuration
 ```
@@ -273,7 +285,7 @@ app-repository/
 2. Build Docker image
 3. Tag with version (e.g., `v2.0.4`)
 4. Push to container registry (GHCR, Docker Hub, etc.)
-5. Update image tag in `helm-prod-values` repository
+5. Update image tag in `helm-values` repository
 6. ArgoCD detects change and syncs automatically

 ---
@@ -283,7 +295,7 @@ app-repository/
 ### The App-of-Apps Pattern

 ```
-_app-of-apps-{cluster}.yaml (Root, per cluster — e.g. upc-dev, eks-prod, gke-dev)
+_app-of-apps.yaml (Root)
    │
    ├── infrastructure-apps (manages infra/)
    │   ├── cluster-resources-application
@@ -303,10 +315,10 @@ _app-of-apps-{cluster}.yaml (Root, per cluster — e.g. upc-dev, eks-prod, gke-d
 ```

 **How It Works**:
-1. Bootstrap script installs ArgoCD and applies `_app-of-apps-upc-dev.yaml` (or `upc-prod`)
-2. ArgoCD creates the root Application which monitors the appropriate `infra/overlays/` folder
-3. Kustomize renders base Applications with cluster-specific patches
-4. `enterprise-apps` Application monitors the cluster's `apps/overlays/` folder
+1. Bootstrap script installs ArgoCD and applies `_app-of-apps.yaml`
+2. ArgoCD creates the root Application which monitors `infra/` folder
+3. Each YAML in `infra/` becomes a child Application
+4. `enterprise-apps.yaml` monitors `apps/` folder and auto-discovers applications
 5. ArgoCD continuously syncs (every 60s) and auto-heals drift

 ### Sync Waves & Ordering
@@ -334,13 +346,13 @@ Applications like `mcp10x` and `musicman` use multiple sources:
 ```yaml
 spec:
  sources:
-  - repoURL: https://git.forteapps.net/Forte/forte-helm
+  - repoURL: https://github.com/fortedigital/forte-helm
    path: forteapp                     # Helm chart templates
    helm:
      valueFiles:
      - $values/mcp10x/values.yaml     # Reference to second source

-  - repoURL: git@github.com:fortedigital/helm-prod-values.git
+  - repoURL: git@github.com:fortedigital/helm-values.git
    targetRevision: HEAD
    ref: values                        # Named reference
 ```
@@ -351,43 +363,6 @@ spec:
 - Easy to update all apps by changing the chart
 - Environment-specific values isolated in separate repo

-### Multi-Cluster Pattern
-
-Kustomize overlays enable deploying the same Applications across clusters with different configurations:
-
-```yaml
-# infra/base/ contains default (upc-dev) Applications
-# Helm values are layered: base + cluster-specific
-valueFiles:
- $values/infra/values/base/traefik-values.yaml    # Shared config
- $values/infra/values/upc-dev/traefik-values.yaml  # Cluster-specific
-
-# infra/overlays/upc-prod/kustomization.yaml patches the second valueFile
-patches:
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/traefik-values.yaml
-```
-
-Cloud-specific values (storage classes, load balancer annotations, cost model) are isolated in per-cluster value files. Base values are fully cloud-agnostic:
-
-| Cloud | Storage Class | Load Balancer | OpenCost Provider |
-|-------|--------------|---------------|-------------------|
-| **UpCloud** | `upcloud-block-storage-maxiops` | UpCloud LB (ProxyProtocol v2) | Custom pricing |
-| **AWS EKS** | `gp3` (EBS CSI) | NLB (ProxyProtocol v2) | AWS CUR |
-| **Azure AKS** | `managed-csi-premium` | Standard LB (`externalTrafficPolicy: Local`) | Azure Billing API |
-| **GCP GKE** | `premium-rwo` (PD CSI) | L4 passthrough NLB | GCP Cloud Billing |
-
-**Benefits**:
- Single source of truth for Application definitions
- Cluster-specific values isolated per overlay
- Easy to add new clusters by creating a new overlay
- Base values shared across all clusters reduce duplication
-
 ---

 ## CI/CD Pipeline
@@ -417,8 +392,8 @@ jobs:

      - name: Update Helm values
        run: |
-          git clone git@github.com:fortedigital/helm-prod-values.git
-          cd helm-prod-values/app
+          git clone git@github.com:fortedigital/helm-values.git
+          cd helm-values/app
          sed -i "s/tag: .*/tag: $VERSION/" values.yaml
          git commit -am "Update app to $VERSION"
          git push
@@ -435,7 +410,7 @@ jobs:
   - Syncs application to cluster

 2. **Helm Values Change**:
-   - CI/CD updates `helm-prod-values/myapp/values.yaml`
+   - CI/CD updates `helm-values/myapp/values.yaml`
   - ArgoCD detects change
   - Pulls new Helm chart with updated values
   - Applies to cluster
@@ -642,7 +617,7 @@ Notifications include:
 ✅ **DO**:
 - Follow the `forteapp` chart pattern
 - Use semantic versioning for image tags
- Update helm-prod-values via CI/CD
+- Update helm-values via CI/CD
 - Test locally with Docker Compose
 - Document environment variables

@@ -663,6 +638,6 @@ Notifications include:

 ---

-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Maintained By**: Platform Team
 **Questions?**: Contact #platform-support on Slack
--- a/docs/OPERATIONS-RUNBOOK.md
+++ b/docs/OPERATIONS-RUNBOOK.md
@@ -37,7 +37,7 @@ Bootstrap a new cluster from scratch:

 #### Prerequisites

-1. **Kubernetes cluster running** (UpCloud, AWS EKS, Azure AKS, GCP GKE, or any K8s cluster)
+1. **Kubernetes cluster running** (UpCloud or any K8s cluster)
 2. **kubectl configured** with admin access
 3. **Repositories cloned** locally

@@ -54,13 +54,11 @@ kubectl get nodes
 git clone https://git.forteapps.net/Forte/launchpad
 cd launchpad

-# 2. Run bootstrap script with cluster target
-# Available clusters: upc-dev, upc-prod, eks-dev, eks-prod,
-#                     aks-dev, aks-prod, gke-dev, gke-prod
-./bootstrap.sh upc-dev
+# 2. Set cluster name (optional)
+export CLUSTER_NAME="prod-cluster-01"

-# Cluster config is loaded from clusters/<cluster>.yaml
-# (cloudProvider, trustedIPs, domain, etc.)
+# 3. Run bootstrap script
+./bootstrap.sh
 ```

 **What Happens:**
@@ -87,8 +85,7 @@ kubectl get applications -n argocd

 1. **Configure DNS** for ingress domains:
   - `argocd.127.0.0.1.nip.io` (local dev)
-   - `*.forteapps.net` (dev)
-   - `*.fortedigital.com` (production)
+   - `*.forteapps.net` (production)

 2. **Verify Let's Encrypt certificates**:
   ```bash
@@ -110,7 +107,7 @@ kubectl get applications -n argocd

 ### ArgoCD Repository Access Setup

-ArgoCD needs SSH access to private Git repositories to pull manifests and Helm values. This section covers setting up deploy keys for Gitea repositories.
+ArgoCD needs SSH access to private Git repositories to pull manifests and Helm values. This section covers setting up deploy keys for GitHub repositories.

 #### Why Deploy Keys?

@@ -122,7 +119,7 @@ ArgoCD needs SSH access to private Git repositories to pull manifests and Helm v
 #### Prerequisites

 - kubectl access to the cluster
- Write access to the Gitea repository
+- Write access to the GitHub repository
 - ArgoCD installed and running

 #### Setup Procedure
@@ -141,16 +138,16 @@ ssh-keygen -t rsa -b 4096 -C "argocd-deploy-key-launchpad" -f argocd-deploy-key

 This creates two files:
 - `argocd-deploy-key` - Private key (keep secret)
- `argocd-deploy-key.pub` - Public key (add to Gitea)
+- `argocd-deploy-key.pub` - Public key (add to GitHub)

-**Step 2: Add Public Key to Gitea**
+**Step 2: Add Public Key to GitHub**

 1. Copy the public key:
   ```bash
   cat argocd-deploy-key.pub
   ```

-2. Go to Gitea repository settings:
+2. Go to GitHub repository settings:
   - Navigate to: `https://git.forteapps.net/Forte/launchpad/settings/keys`
   - Or: Repository → Settings → Deploy keys

@@ -160,12 +157,12 @@ This creates two files:
   - ☐ Allow write access (leave unchecked - read-only is sufficient)
   - Click **"Add key"**

-4. Repeat for the `helm-prod-values` repository if it's private:
+4. Repeat for the `helm-values` repository if it's private:
   ```bash
-   # Generate separate key for helm-prod-values repo
-   ssh-keygen -t ed25519 -C "argocd-deploy-key-helm-prod-values" -f argocd-helm-prod-values-key -N ""
+   # Generate separate key for helm-values repo
+   ssh-keygen -t ed25519 -C "argocd-deploy-key-helm-values" -f argocd-helm-values-key -N ""

-   # Add to: https://git.forteapps.net/Forte/helm-prod-values/settings/keys
+   # Add to: https://github.com/fortedigital/helm-values/settings/keys
   ```

 **Step 3: Create Kubernetes Secret**
@@ -210,7 +207,7 @@ kubectl get secrets -n argocd -l argocd.argoproj.io/secret-type=repository
 # Settings → Repositories → Should show "Successful" status

 # Test by creating an application
-kubectl apply -f _app-of-apps-upc-dev.yaml   # or _app-of-apps-upc-prod.yaml
+kubectl apply -f _app-of-apps.yaml

 # Check application sync status
 kubectl get applications -n argocd
@@ -273,7 +270,7 @@ rm /tmp/test-repo-access.yaml
   # Generate new key
   ssh-keygen -t ed25519 -C "argocd-deploy-key-$(date +%Y%m)" -f argocd-new-key -N ""

-   # Add new public key to Gitea (keep old key for now)
+   # Add new public key to GitHub (keep old key for now)

   # Update Kubernetes secret
   kubectl create secret generic repo-launchpad \
@@ -281,7 +278,7 @@ rm /tmp/test-repo-access.yaml
     --namespace=argocd \
     --dry-run=client -o yaml | kubectl apply -f -

-   # Test access, then remove old deploy key from Gitea
+   # Test access, then remove old deploy key from GitHub

   # Clean up
   shred -u argocd-new-key
@@ -292,7 +289,7 @@ rm /tmp/test-repo-access.yaml
   # List all repository secrets
   kubectl get secrets -n argocd -l argocd.argoproj.io/secret-type=repository

-   # Review deploy keys in Gitea
+   # Review deploy keys in GitHub
   # Visit: https://git.forteapps.net/Forte/launchpad/settings/keys
   ```

@@ -315,16 +312,16 @@ kubectl get secret repo-launchpad -n argocd -o yaml | grep argocd.argoproj.io/se
 # Check ArgoCD application controller logs
 kubectl logs -n argocd deployment/argocd-application-controller | grep -i "permission denied"

-# Verify deploy key is added to Gitea
+# Verify deploy key is added to GitHub
 # Visit: https://git.forteapps.net/Forte/launchpad/settings/keys
 ```

 **Issue: "Host key verification failed"**

 ```bash
-# Add Gitea to known_hosts
+# Add GitHub to known_hosts
 kubectl exec -n argocd deployment/argocd-repo-server -- \
-  ssh-keyscan git.forteapps.net >> ~/.ssh/known_hosts
+  ssh-keyscan github.com >> ~/.ssh/known_hosts

 # Or disable strict host key checking (less secure)
 kubectl patch secret repo-launchpad -n argocd \
@@ -349,16 +346,16 @@ kubectl rollout restart deployment argocd-application-controller -n argocd

 #### Multiple Repository Setup

-For the three-repository pattern (launchpad, forte-helm, helm-prod-values):
+For the three-repository pattern (launchpad, forte-helm, helm-values):

 ```bash
 # 1. launchpad (main config repo)
 ssh-keygen -t ed25519 -C "argocd-launchpad" -f key-sturdy -N ""
 # Add key-sturdy.pub to: https://git.forteapps.net/Forte/launchpad/settings/keys

-# 2. helm-prod-values (private values repo)
-ssh-keygen -t ed25519 -C "argocd-helm-prod-values" -f key-helm-prod-values -N ""
-# Add key-helm-prod-values.pub to: https://git.forteapps.net/Forte/helm-prod-values/settings/keys
+# 2. helm-values (private values repo)
+ssh-keygen -t ed25519 -C "argocd-helm-values" -f key-helm-values -N ""
+# Add key-helm-values.pub to: https://github.com/fortedigital/helm-values/settings/keys

 # 3. forte-helm (private helm charts repo)

@@ -369,14 +366,14 @@ kubectl create secret generic repo-launchpad \
  kubectl label --local -f - argocd.argoproj.io/secret-type=repository --dry-run=client -o yaml | \
  kubectl apply -f -

-kubectl create secret generic repo-helm-prod-values \
-  --from-file=sshPrivateKey=key-helm-prod-values \
+kubectl create secret generic repo-helm-values \
+  --from-file=sshPrivateKey=key-helm-values \
  --namespace=argocd --dry-run=client -o yaml | \
  kubectl label --local -f - argocd.argoproj.io/secret-type=repository --dry-run=client -o yaml | \
  kubectl apply -f -

 # Clean up keys
-shred -u key-sturdy key-helm-prod-values
+shred -u key-sturdy key-helm-values
 ```

 #### Converting HTTPS to SSH
@@ -393,7 +390,7 @@ If you're currently using HTTPS and want to switch to SSH:
 #   repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git

 # 3. Update and commit
-find . -name "*.yaml" -type f -exec sed -i 's|https://git.forteapps.net/Forte/|git@git.forteapps.net:Forte/|g' {} +
+find . -name "*.yaml" -type f -exec sed -i 's|https://github.com/fortedigital/|git@github.com:fortedigital/|g' {} +

 git add .
 git commit -m "Switch from HTTPS to SSH for repository access"
@@ -497,7 +494,7 @@ spec:
 See [Developer Guide](DEVELOPER-GUIDE.md#deploying-your-first-application) for detailed steps.

 **Quick checklist:**
- [ ] Create `helm-prod-values/myapp/values.yaml`
+- [ ] Create `helm-values/myapp/values.yaml`
 - [ ] Create `apps/myapp.yaml` in config repo
 - [ ] Create SealedSecret if needed
 - [ ] Commit and push changes
@@ -562,7 +559,7 @@ kubectl scale deployment myapp -n myapp --replicas=3

 #### GitOps Scaling

-Update `helm-prod-values/myapp/values.yaml`:
+Update `helm-values/myapp/values.yaml`:

 ```yaml
 app:
@@ -576,7 +573,7 @@ Commit and push - ArgoCD will sync.
 Enable Horizontal Pod Autoscaler:

 ```yaml
-# In helm-prod-values/myapp/values.yaml
+# In helm-values/myapp/values.yaml
 app:
  hpa:
    enabled: true
@@ -625,7 +622,7 @@ kubectl rollout undo deployment myapp -n myapp
 #### Option 3: Change Image Tag

 ```bash
-# Edit helm-prod-values
+# Edit helm-values
 cd ~/dev/k8s/helm-prod-values
 vim myapp/values.yaml

@@ -645,7 +642,7 @@ git push
 #### Update Resource Limits

 ```yaml
-# In helm-prod-values/myapp/values.yaml
+# In helm-values/myapp/values.yaml
 app:
  resources:
    requests:
@@ -659,7 +656,7 @@ app:
 #### Enable Database

 ```yaml
-# In helm-prod-values/myapp/values.yaml
+# In helm-values/myapp/values.yaml
 db:
  enabled: true
  persistence:
@@ -1264,21 +1261,13 @@ spec:

 ### Backup Strategy

-**Current State**: Gitea daily backups to S3-compatible storage
+**Current State**: No automated backups

-**What Is Backed Up**:
- ✅ Gitea repositories + database: Daily CronJob (`cluster-resources/gitea-backup-cronjob.yaml`) uploads to S3-compatible storage with 7-day retention
- ✅ Git repositories: Full cluster config recoverable from Git
- ⚠️ Secrets: Sealed secrets in Git; unseal keys need safekeeping
-
-**What Is NOT Backed Up**:
- ❌ Cluster state (recreate via GitOps)
- ❌ Other persistent volumes (Prometheus, Loki, Tempo data)
-
-**Per-cloud backup scripts** (manual restore helpers):
- UpCloud/AWS: `scripts/gitea-backup.sh` / `scripts/gitea-backup-eks.sh` (MinIO CLI, S3-compatible)
- Azure: `scripts/gitea-backup-aks.sh` (Azure CLI + Blob Storage)
- GCP: `scripts/gitea-backup-gke.sh` (gsutil + GCS)
+**What Needs Backup**:
+- ❌ Cluster state (not backed up - recreate via GitOps)
+- ❌ Persistent volumes (currently not critical)
+- ✅ Git repositories (GitHub provides backup)
+- ⚠️ Secrets (sealed secrets in Git, unseal keys need safekeeping)

 ### Cluster Rebuild

@@ -1363,13 +1352,13 @@ kubectl get deployment argocd-server -n argocd \
  -o jsonpath='{.spec.template.spec.containers[0].image}'

 # Update version in values
-vim infra/values/base/argocd-values.yaml
+vim infra/values/argocd-values.yaml

 # Or upgrade via Helm directly
 helm upgrade argocd argo-cd \
  --repo https://argoproj.github.io/argo-helm \
  --namespace argocd \
-  --values infra/values/base/argocd-values.yaml \
+  --values infra/values/argocd-values.yaml \
  --version 6.0.0  # New version

 # Verify
@@ -1380,9 +1369,6 @@ kubectl get pods -n argocd

 ```bash
 # UpCloud: Upgrade via control panel or CLI
-# AWS EKS: eksctl upgrade cluster / AWS Console
-# Azure AKS: az aks upgrade / Azure Portal
-# GCP GKE: gcloud container clusters upgrade / Cloud Console

 # After upgrade, verify cluster
 kubectl version
@@ -1468,8 +1454,8 @@ kubectl top pods --all-namespaces --sort-by=cpu
 Example: Adding Redis

 ```bash
-# 1. Create application manifest in base/
-cat > infra/base/redis-application.yaml <<EOF
+# 1. Create application manifest
+cat > infra/redis-application.yaml <<EOF
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -1479,17 +1465,15 @@ metadata:
    argocd.argoproj.io/sync-wave: "1"
 spec:
  project: default
-  sources:
-  - repoURL: https://charts.bitnami.com/bitnami
+  source:
+    repoURL: https://charts.bitnami.com/bitnami
    chart: redis
    targetRevision: 18.0.0
    helm:
-      releaseName: redis
-      valueFiles:
-      - \$values/infra/values/base/redis-values.yaml
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
+      values: |
+        auth:
+          enabled: true
+          password: changeme
  destination:
    server: https://kubernetes.default.svc
    namespace: redis
@@ -1501,54 +1485,30 @@ spec:
    - CreateNamespace=true
 EOF

-# 2. Add to base kustomization
-# Edit infra/base/kustomization.yaml and add: - redis-application.yaml
-
-# 3. Create base values file
-cat > infra/values/base/redis-values.yaml <<EOF
-auth:
-  enabled: true
-EOF
-
-# 4. Commit and push
-git add infra/base/redis-application.yaml infra/values/base/redis-values.yaml infra/base/kustomization.yaml
+# 2. Commit and push
+git add infra/redis-application.yaml
 git commit -m "Add Redis infrastructure component"
 git push

-# 5. ArgoCD will auto-sync within 60 seconds
+# 3. ArgoCD will auto-sync within 60 seconds
 ```

-### Multi-Cluster Setup
+### Multi-Cluster Setup (Future)

-The repository supports multiple clusters across multiple clouds via Kustomize overlays:
+For multi-cluster deployments:

-**Active clusters:**
- **upc-dev** (default): `infra/overlays/upc-dev/` — uses base Applications as-is
- **upc-prod**: `infra/overlays/upc-prod/` — patches value file paths from `upc-dev` to `upc-prod`
+```yaml
+# Different destinations per environment
+# dev-cluster
+destination:
+  server: https://dev.k8s.example.com
+  namespace: myapp

-**Cloud-ready templates (fill in `clusters/*.yaml` before use):**
- **eks-dev** / **eks-prod**: AWS EKS with NLB, gp3 storage, AWS CUR pricing
- **aks-dev** / **aks-prod**: Azure AKS with Standard LB, managed-csi-premium storage
- **gke-dev** / **gke-prod**: GCP GKE with L4 LB, premium-rwo storage
-
-Each cluster has its own:
- Root app-of-apps: `_app-of-apps-{cluster}.yaml`
- Cluster config: `clusters/{cluster}.yaml` (domain, trustedIPs, cloudProvider)
- Kustomize overlay: `infra/overlays/{cluster}/kustomization.yaml`
- Helm value overrides: `infra/values/{cluster}/` (traefik, gitea, opencost)
- Sealed secrets: `secrets/{cluster}/` (as needed)
- Apps overlay: `apps/overlays/{cluster}/`
-
-Cloud-specific values handled per-cluster:
-
-| Concern | UpCloud | AWS EKS | Azure AKS | GCP GKE |
-|---------|---------|---------|-----------|---------|
-| **Storage class** | `upcloud-block-storage-maxiops` | `gp3` | `managed-csi-premium` | `premium-rwo` |
-| **Load balancer** | UpCloud LB + ProxyProtocol v2 | NLB + ProxyProtocol v2 | Standard LB + `externalTrafficPolicy: Local` | L4 passthrough NLB |
-| **Cost monitoring** | Custom pricing | AWS CUR | Azure Billing API | GCP Cloud Billing |
-| **Backup storage** | UpCloud S3-compat | AWS S3 (native) | Azure Blob Storage | GCS |
-
-To add a new cluster, create a new overlay directory (e.g., `infra/overlays/eks-staging/`) with patches that swap the value file paths, and a matching `clusters/eks-staging.yaml`.
+# prod-cluster
+destination:
+  server: https://prod.k8s.example.com
+  namespace: myapp
+```

 ### Blue-Green Deployments

@@ -1592,7 +1552,7 @@ git push
 kubectl scale deployment myapp -n myapp --replicas=0

 # Update Git
-vim helm-prod-values/myapp/values.yaml
+vim helm-values/myapp/values.yaml
 # Set replicaCount: 0
 git commit -am "Scale down myapp for maintenance"
 git push
@@ -1665,7 +1625,7 @@ echo "Remember to delete: $SECRET_FILE"

 - [ ] Application code repository created
 - [ ] Dockerfile created and tested
- [ ] Gitea Actions workflow configured
+- [ ] GitHub Actions workflow configured
 - [ ] Helm values created in `helm-prod-values/`
 - [ ] ArgoCD application manifest created in `apps/`
 - [ ] Secrets created and sealed
@@ -1691,6 +1651,6 @@ echo "Remember to delete: $SECRET_FILE"

 ---

-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Maintained By**: Platform Team
 **Emergency Contact**: #platform-support on Slack
--- a/docs/README.md
+++ b/docs/README.md
@@ -180,7 +180,7 @@ Reference for:
                            │
                            ▼
 ┌──────────────────────────────────────────────────────────────┐
-│          Kubernetes Clusters (UpCloud, AWS, Azure, GCP)       │
+│               Kubernetes Cluster (UpCloud)                    │
 │  ┌──────────────────────────────────────────────────────┐    │
 │  │  Infrastructure: Traefik, Cert-Manager, Kyverno     │    │
 │  ├──────────────────────────────────────────────────────┤    │
@@ -194,7 +194,7 @@ Reference for:
 ### Key Technologies

 - **GitOps**: ArgoCD
- **Kubernetes**: Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE)
+- **Kubernetes**: UpCloud Managed Kubernetes
 - **Ingress**: Traefik v2
 - **Certificates**: Cert-Manager + Let's Encrypt
 - **Policies**: Kyverno
@@ -299,16 +299,11 @@ docs/
 ## 🔄 Documentation Versions

 **Current Version**: 1.0.0
-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Maintained By**: Platform Team

 ### Changelog

- **v1.1.0 (2026-04-22)**: Multi-cloud support
-  - Cloud-agnostic base values (storage, LB, pricing moved to per-cluster overlays)
-  - Added AWS EKS, Azure AKS, GCP GKE configurations
-  - Per-cloud backup scripts
-  - Updated all documentation
 - **v1.0.0 (2026-03-16)**: Initial comprehensive documentation release
  - GitOps Architecture guide
  - Developer Onboarding guide
--- a/docs/REFERENCE.md
+++ b/docs/REFERENCE.md
@@ -9,7 +9,6 @@
 - [Kyverno Policies](#kyverno-policies)
 - [Configuration Reference](#configuration-reference)
 - [API Endpoints](#api-endpoints)
- [Cloud Overlay Pattern](#cloud-overlay-pattern)
 - [Glossary](#glossary)

 ---
@@ -20,10 +19,9 @@

 | Component | Value |
 |-----------|-------|
-| **Provider** | Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE) |
-| **Environment** | Dev + Production per cloud |
-| **Active clusters** | UpCloud (upc-dev, upc-prod) |
-| **Cloud-ready templates** | EKS, AKS, GKE (dev + prod each) |
+| **Provider** | UpCloud Managed Kubernetes |
+| **Environment** | Production (internal use) |
+| **Cluster Count** | Single cluster |
 | **GitOps Tool** | ArgoCD |
 | **Ingress Controller** | Traefik v2 |
 | **Certificate Management** | Cert-Manager + Let's Encrypt |
@@ -44,7 +42,7 @@ Internet
 [DNS: *.forteapps.net]
   │
   ▼
-[Cloud Load Balancer]
+[UpCloud LoadBalancer]
   │
   ▼
 [Traefik Ingress Controller]
@@ -73,8 +71,7 @@ Internet
 ```
 launchpad/
 ├── bootstrap.sh                   # Cluster initialization script
-├── _app-of-apps-upc-dev.yaml     # Root ArgoCD Application (upc-dev)
-├── _app-of-apps-upc-prod.yaml    # Root ArgoCD Application (upc-prod)
+├── _app-of-apps.yaml              # Root ArgoCD Application
 │
 ├── infra/                         # Infrastructure applications
 │   ├── cluster-resources-application.yaml
@@ -88,39 +85,22 @@ launchpad/
 │   ├── loki.yaml
 │   ├── tempo.yaml
 │   ├── fluent-bit.yaml
+│   ├── trivy.yaml
 │   ├── gitea.yaml
 │   ├── gitea-actions.yaml
 │   ├── sealedsecrets.yaml
 │   ├── secrets.yaml
 │   ├── renovate.yaml
-│   ├── base/                      # ArgoCD Application manifests (Kustomize base)
-│   │   ├── gitea.yaml
-│   │   ├── opencost.yaml
-│   │   ├── traefik-application.yaml
-│   │   ├── keycloak.yaml
-│   │   ├── grafana.yaml
-│   │   └── ...
-│   ├── overlays/
-│   │   └── upc-prod/
-│   │       └── kustomization.yaml # Patches upc-dev → upc-prod valueFile paths
 │   └── values/
-│       ├── base/                   # Cloud-agnostic Helm values
-│       │   ├── gitea-values.yaml
-│       │   ├── opencost-values.yaml
-│       │   ├── prometheus-values.yaml
-│       │   └── ...
-│       ├── upc-dev/               # UpCloud dev overlay values
-│       │   ├── traefik-values.yaml
-│       │   ├── keycloak-values.yaml
-│       │   ├── grafana-values.yaml
-│       │   ├── gitea-values.yaml
-│       │   └── opencost-values.yaml
-│       └── upc-prod/              # UpCloud prod overlay values
-│           ├── traefik-values.yaml
-│           ├── keycloak-values.yaml
+│       ├── argocd-values.yaml
+│       ├── prometheus-values.yaml
 │       ├── grafana-values.yaml
+│       ├── loki-values.yaml
+│       ├── tempo-values.yaml
 │       ├── gitea-values.yaml
-│           └── opencost-values.yaml
+│       ├── gitea-actions-values.yaml
+│       ├── fluent-bit-values.yaml
+│       └── renovate-values.yaml
 │
 ├── apps/                          # Business applications
 │   ├── mcp10x.yaml
@@ -143,43 +123,15 @@ launchpad/
 │       ├── replicaset-cleaner.yaml
 │       ├── default-ns-blocker.yaml
 │       ├── secret-cloner.yaml
-│       ├── keycloak-client-cloner.yaml
 │       └── auth-sidecar-injector.yaml
 │
 ├── secrets/                       # Application secrets (sealed)
-│   ├── base/                     # All SealedSecrets (shared across clouds)
-│   │   ├── kustomization.yaml
-│   │   ├── argocd-forte-helm-secret-sealed.yaml
-│   │   ├── argocd-mcp-credentials.yaml
-│   │   ├── argocdmcp-auth-oidc-sealed.yaml
-│   │   ├── dot-ai-secrets.yaml
-│   │   ├── forte10x-app-credentials-sealed.yaml
-│   │   ├── gitea-backup-s3-sealed.yaml
-│   │   ├── gitea-credentials-sealed.yaml
-│   │   ├── gitea-runner-token-sealed.yaml
-│   │   ├── gitea-smtp-secret-sealed.yaml
-│   │   ├── keycloak-credentials-sealed.yaml
-│   │   ├── musicman-auth-oidc-sealed.yaml
-│   │   ├── musicman-credentials.yaml
-│   │   └── renovate-env-sealed.yaml
-│   └── overlays/                 # Per-cloud overlays (reference base)
-│       ├── aks-dev/kustomization.yaml
-│       ├── aks-prod/kustomization.yaml
-│       ├── eks-dev/kustomization.yaml
-│       ├── eks-prod/kustomization.yaml
-│       ├── gke-dev/kustomization.yaml
-│       ├── gke-prod/kustomization.yaml
-│       ├── upc-dev/kustomization.yaml
-│       └── upc-prod/kustomization.yaml
-│
-├── scripts/                       # Operational helper scripts
-│   ├── gitea-backup.sh            # S3 backup helper (list/download)
-│   ├── gitea-restore.sh
-│   └── backup/                    # Per-cloud backup reference scripts
-│       ├── s3-minio.sh            # S3-compatible (UpCloud, MinIO, Wasabi)
-│       ├── aws-s3.sh              # Native AWS S3
-│       ├── azure-blob.sh          # Azure Blob Storage
-│       └── gcp-gcs.sh             # GCP Cloud Storage
+│   ├── argocd-mcp-credentials.yaml
+│   ├── dot-ai-secrets.yaml
+│   ├── gitea-credentials-sealed.yaml
+│   ├── gitea-runner-token-sealed.yaml
+│   ├── mcp10x-credentials-sealed.yaml
+│   └── musicman-credentials.yaml
 │
 ├── private/                       # Local-only (Git-ignored)
 │   ├── *.yaml
@@ -203,15 +155,15 @@ ArgoCd() {
  helm upgrade --install argocd argo-cd \
    --repo https://argoproj.github.io/argo-helm \
    --namespace argocd --create-namespace \
-    --values infra/values/base/argocd-values.yaml \
+    --values infra/values/argocd-values.yaml \
    --set notifications.context.clusterName="$CLUSTER_NAME" \
    --timeout 60s --atomic

-  kubectl apply -f _app-of-apps-upc-dev.yaml -n argocd   # or _app-of-apps-upc-prod.yaml
+  kubectl apply -f _app-of-apps.yaml -n argocd
 }
 ```

-**`_app-of-apps-upc-dev.yaml`** / **`_app-of-apps-upc-prod.yaml`**
+**`_app-of-apps.yaml`**
 ```yaml
 apiVersion: argoproj.io/v1alpha1
 kind: Application
@@ -236,7 +188,7 @@ spec:

 ### Helm Charts Repository: `forte-helm`

-**URL**: `https://git.forteapps.net/Forte/forte-helm`
+**URL**: `https://github.com/fortedigital/forte-helm`

 #### Chart: `forteapp`

@@ -383,18 +335,20 @@ configmap: []                    # Application ConfigMap key-value pairs

 ---

-### Helm Values Repository: `helm-prod-values`
+### Helm Values Repository: `helm-values`

-**URL**: `https://git.forteapps.net/Forte/helm-prod-values.git`
+**URL**: `https://github.com/fortedigital/helm-values.git`

 #### Structure

 ```
-helm-prod-values/
+helm-values/
 ├── mcp10x/
 │   └── values.yaml
 ├── musicman/
 │   └── values.yaml
+├── mcpcoder/
+│   └── values.yaml
 └── argocd-mcp/
    └── values.yaml
 ```
@@ -570,14 +524,14 @@ spec:

  # Multi-source configuration
  sources:
-  - repoURL: https://git.forteapps.net/Forte/forte-helm
+  - repoURL: https://github.com/fortedigital/forte-helm
    path: forteapp
    targetRevision: HEAD
    helm:
      valueFiles:
      - $values/<app-name>/values.yaml

-  - repoURL: git@github.com:fortedigital/helm-prod-values.git
+  - repoURL: git@github.com:fortedigital/helm-values.git
    targetRevision: HEAD
    ref: values

@@ -648,95 +602,6 @@ retry:
 4. 40 seconds
 5. 80 seconds (capped at 3 minutes)

-### Global Settings (`argocd-cm`)
-
-| Setting | Value | Purpose |
-|---------|-------|---------|
-| `application.resourceTrackingMethod` | `annotation` | Track resources via annotations |
-| `timeout.reconciliation` | `60s` | Reconciliation interval |
-| `admin.enabled` | `false` | Admin login disabled (SSO-only) |
-| `url` | `https://argocd.forteapps.net` | External URL for ArgoCD UI |
-
-**Git Submodule Disable**: Set via `configs.params` (NOT `repoServer.env` — that causes strategic merge conflicts with chart's `valueFrom` entries):
-```yaml
-configs:
-  params:
-    "reposerver.enable.git.submodule": "false"
-```
-This writes to `argocd-cmd-params-cm` ConfigMap, which the chart already reads via `valueFrom`. Submodules (e.g., `shared-prompts`) are not needed for K8s manifest generation.
-
-**Break-Glass Admin Access**: Admin login is disabled (`admin.enabled: false`). The admin password remains in `argocd-secret`. To re-enable temporarily:
-```bash
-# Enable admin login
-kubectl patch cm argocd-cm -n argocd -p '{"data":{"admin.enabled":"true"}}'
-# Log in as admin, do what's needed, then disable again
-kubectl patch cm argocd-cm -n argocd -p '{"data":{"admin.enabled":"false"}}'
-```
-ArgoCD picks up ConfigMap changes within the reconciliation timeout (60s). Note: ArgoCD will revert this on next sync — this is intentional (temporary access only).
-
-**OIDC Authentication** (Keycloak):
-```yaml
-configs:
-  cm:
-    oidc.config: |
-      name: Forte SSO
-      issuer: https://id.forteapps.net/realms/forte
-      clientID: argocd
-      clientSecret: $oidc.clientSecret
-      requestedScopes: ["openid", "email", "profile"]
-  rbacConfig:
-    policy.csv: |
-      g, ArgoCD Admins, role:admin
-      g, ArgoCD Viewers, role:readonly
-    # Deny users not in any declared KC group
-    policy.default: ""
-    scopes: '[groups]'
-```
-
-**Access Control**: Only users in declared Keycloak groups can access ArgoCD. Users not in any group are denied (`policy.default: ""`). Assign users to groups in Keycloak admin console.
-
-| KC Group | ArgoCD Role | Access |
-|----------|-------------|--------|
-| `ArgoCD Admins` | `role:admin` | Full control over all apps |
-| `ArgoCD Viewers` | `role:readonly` | Read-only access to all apps |
-| `Observability Team` | `role:observability` | Get/sync monitoring apps (prometheus, loki, fluent-bit, tempo, grafana, opencost) |
-| `Dev Tools Team` | `role:devtools` | Get/sync dev tool apps (gitea, gitea-actions, renovate, karpor) |
-| `App Developers` | `role:app-dev` | Get/sync/action on enterprise-apps only |
-
-**Per-Cluster RBAC**: Add cluster-specific policies in `infra/values/<cluster>/argocd-values.yaml` using `configs.rbac.policy.<cluster>.csv`. ArgoCD concatenates all `policy.*.csv` keys alphabetically after `policy.csv`. Example:
-```yaml
-# infra/values/upc-dev/argocd-values.yaml
-configs:
-  rbac:
-    policy.upc-dev.csv: |
-      p, role:staging-deployer, applications, sync, default/enterprise-apps, allow
-      g, Staging Deployers, role:staging-deployer
-```
-
- ArgoCD does NOT add `openid` implicitly — must include in `requestedScopes`
- Do NOT add `groups` as a scope — the KC groups mapper emits the claim regardless
- `$oidc.clientSecret` references the `oidc.clientSecret` key in `argocd-secret`
- OIDC secret is synced by CronJob `argocd-oidc-sync` (see `cluster-resources/argocd-oidc-secret-sync.yaml`)
- The CronJob bridges `argocd-oidc-credentials` (from KC registrar) → `argocd-secret` every 2 min
- Safe for fresh deploys: no-ops if source secret doesn't exist yet
-
-**Ingress** (Traefik + TLS):
-```yaml
-server:
-  ingress:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-    tls: true
-  extraArgs:
-  - --insecure
-configs:
-  params:
-    "server.insecure": true
-```
-TLS terminates at Traefik; ArgoCD runs in insecure mode behind the proxy.
-
 ---

 ## Infrastructure Components
@@ -749,7 +614,7 @@ TLS terminates at Traefik; ArgoCD runs in insecure mode behind the proxy.

 **Configuration**:
 ```yaml
-# infra/base/traefik-application.yaml
+# infra/traefik-application.yaml
 replicas: 2

 service:
@@ -812,10 +677,6 @@ spec:
 **Chart**: `sealed-secrets/sealed-secrets-controller`
 **Namespace**: `kube-system`

-**Directory Structure**: `secrets/base/` contains all SealedSecrets with a `kustomization.yaml`. Per-cloud overlays in `secrets/overlays/<cloud>/` reference the base via Kustomize. The ArgoCD `secrets` Application points to the active overlay (e.g., `secrets/overlays/upc-dev`), and `infra/overlays/upc-prod` patches the path to `secrets/overlays/upc-prod`.
-
-To add cloud-specific secrets, create a new SealedSecret in the overlay directory and add it to the overlay's `kustomization.yaml`.
-
 **Public Certificate**:
 ```bash
 kubeseal --fetch-cert \
@@ -856,15 +717,6 @@ kubeStateMetrics:
 - Loki
 - Tempo

-**Ingress**: Exposed via Traefik at `https://grafana.forteapps.net` with cert-manager TLS.
-
-**OIDC Authentication** (Keycloak):
- Uses `grafana.ini.auth.generic_oauth` with KC `grafana` client
- Secret `grafana-oidc-credentials` synced by KC registrar, loaded via `envFromSecrets`
- SSO-only mode: `auth.disable_login_form: true` + `auth.generic_oauth.auto_login: true`
- Role mapping via JMESPath on `resource_access.grafana.roles` claim (requires KC client role mapper)
- Roles: KC client roles `Admin`/`Editor` map to Grafana roles; default is `Viewer`
-
 ### Loki

 **Chart**: `grafana/loki-stack`
@@ -937,7 +789,7 @@ persistence:

 **Configuration**:
 ```yaml
-# infra/base/gitea.yaml + infra/values/base/gitea-values.yaml
+# infra/gitea.yaml + infra/values/gitea-values.yaml
 ingress:
  host: git.forteapps.net
  tls: cert-manager (letsencrypt-prod)
@@ -961,23 +813,14 @@ postgresql:
  persistence: 8Gi (upcloud-block-storage-maxiops)
 ```

-**Authentication**: Keycloak OIDC via `forte` realm (client ID: `gitea`). Protocol mapper: `email_verified` hardcoded claim (`true`, boolean) on ID token, Access token, and Userinfo.
-
-**External User Sync**: Disabled (`cron.sync_external_users.ENABLED: false`). This Gitea cron job is designed for LDAP and deactivates OIDC-only users because it cannot enumerate them — causing "Sign-in prohibited" errors after the sync runs.
-
-**Email Notifications**: Enabled (`ENABLE_NOTIFY_MAIL: true`). SMTP credentials injected via `gitea-smtp-secret` using `additionalConfigFromEnvs` with `GITEA__mailer__USER` / `GITEA__mailer__PASSWD` environment variables.
-
-**Auto-Watch**: Disabled (`AUTO_WATCH_ON_CHANGES: false`, `AUTO_WATCH_NEW_REPOS: false`). Prevents contributors from being auto-subscribed to repo notifications on push, reducing email noise from CI bots (e.g., ai-review PR comments). Users who were already watching before this change need to manually unwatch or switch to "Only participating".
+**Authentication**: Keycloak OIDC via `forte` realm (client ID: `gitea`)

 **Endpoints**:
 - Web UI: `https://git.forteapps.net`
 - SSH: port 22 (ClusterIP)
 - Metrics: `/metrics` (Prometheus scrape)

-**Secrets**:
- `gitea-credentials` (SealedSecret) — admin password
- `gitea-oidc-credentials` (registrar-managed) — OIDC client ID + secret
- `gitea-smtp-secret` (SealedSecret) — SMTP username + password
+**Secrets**: `gitea-credentials` (SealedSecret) containing `admin-password`, `postgres-password`, `secret` (OIDC client secret)

 ### Gitea Actions Runners

@@ -989,7 +832,7 @@ postgresql:

 **Configuration**:
 ```yaml
-# infra/base/gitea-actions.yaml + infra/values/base/gitea-actions-values.yaml
+# infra/gitea-actions.yaml + infra/values/gitea-actions-values.yaml
 replicaCount: 3

 runner:
@@ -1026,224 +869,6 @@ dind:
 - Gitea admin panel (`/admin/runners`) — runners show as Online
 - Create test workflow in `.gitea/workflows/test.yml` — job executes

-### AI Code Review (ai-review)
-
-**Type**: Gitea Actions workflow (`.gitea/workflows/ai-review.yaml`)
-**Trigger**: `pull_request` events (`opened`, `synchronize`)
-**Runner**: `ubuntu-latest` (container: `nikitafilonov/ai-review:latest`)
-
-**Purpose**: Automated AI-powered code review on pull requests using Claude (Anthropic). Posts inline comments on changed lines and a PR summary comment highlighting infrastructure impact.
-
-**Architecture**:
- Uses [xai-review](https://github.com/nicktechnologies/xai-review) Docker image
- Shared configuration and prompts live in the `shared-prompts` Git submodule (→ `Forte/ai-review-prompts`)
- Review mode: `ONLY_ADDED_WITH_CONTEXT` — reviews only new/changed lines plus surrounding context (token-efficient)
- Agent mode: disabled (one-shot review, no multi-turn reasoning)
- LLM: Claude Sonnet (`claude-sonnet-4-20250514`)
-
-**Shared Prompts Structure** (submodule: `Forte/ai-review-prompts`):
-```
-shared-prompts/
-  base/
-    security.md          # org-wide security rules (all profiles)
-  iac/
-    .ai-review.yaml      # IaC/GitOps profile config
-    inline.md            # inline review prompt
-    summary.md           # PR summary prompt
-  # future profiles: backend/, frontend/, etc.
-```
-
-**Configuration** (`shared-prompts/iac/.ai-review.yaml`):
-```yaml
-llm:
-  provider: CLAUDE
-  model: claude-sonnet-4-20250514
-vcs:
-  provider: GITEA
-review:
-  mode: ONLY_ADDED_WITH_CONTEXT
-agent:
-  enabled: false
-prompt:
-  inline_prompt_files:            # concatenated in order
-    - ./shared-prompts/base/security.md
-    - ./shared-prompts/iac/inline.md
-  summary_prompt_files:
-    - ./shared-prompts/iac/summary.md
-ignore:
-  - "*.sealed.yaml"
-  - "*.lock"
-  - "docs/**"
-```
-
-**Custom Prompts** (IaC profile):
- `shared-prompts/base/security.md` — org-wide security rules, concatenated before every inline review prompt
- `shared-prompts/iac/inline.md` — IaC-specific inline review (YAML, Helm, K8s manifests, shell scripts), max 7 comments
- `shared-prompts/iac/summary.md` — PR summary: affected services/namespaces, infrastructure impact, security flags
-
-**Prompt composition**: ai-review does not support Jinja includes. Instead, list multiple files under `inline_prompt_files` / `summary_prompt_files` — they are concatenated in order with double newlines.
-
-**Adding a new profile**: Create a new directory (e.g., `backend/`) with its own `.ai-review.yaml`, `inline.md`, and `summary.md`. The `inline_prompt_files` list should include `base/security.md` first, then the profile-specific prompt. Reference it in the consuming repo's workflow: `AI_REVIEW_CONFIG_FILE_YAML=./shared-prompts/backend/.ai-review.yaml`
-
-**Required Secrets** (configure in Gitea repo or org settings):
-
-| Secret | Purpose |
-|--------|---------|
-| `ANTHROPIC_API_KEY` | Claude API key (from Anthropic console) |
-| `AI_REVIEW_TOKEN` | Gitea API token with `write:repository` + `read:repository` scopes (use a bot/service account) |
-
-**Setup Steps**:
-1. Create a Gitea bot/service account and generate an API token with `write:repository` + `read:repository` scopes
-2. Add `AI_REVIEW_TOKEN` secret in Gitea repo settings → Actions → Secrets
-3. Add `ANTHROPIC_API_KEY` secret with your Anthropic API key
-4. Ensure the `shared-prompts` submodule is initialized (`git submodule update --init`)
-5. Push the workflow file — it triggers automatically on PR creation/update
-
-**Verification**:
- Open a PR with infrastructure changes → workflow runs → inline comments + summary appear
- Check Gitea Actions tab for workflow run status and logs
- Monitor Anthropic usage dashboard for token consumption
-
-### Keycloak Client Registrar
-
-**Type**: CronJob (deployed via Keycloak Helm chart `extraDeploy`)
-**Namespace**: `keycloak`
-**Schedule**: `*/2 * * * *` (every 2 minutes)
-
-**Purpose**: Handles two responsibilities:
-1. **Legacy sync** — extracts secrets from Keycloak clients with `k8s.secret.sync: "true"` attribute (same as former PostSync syncer)
-2. **Self-service registration** — processes config Secrets (cloned by Kyverno) to register new OIDC clients and sync their credentials
-
-**How It Works**:
-
-*Legacy path (existing clients like Gitea):*
-1. Authenticates to Keycloak Admin API using admin credentials from `keycloak-credentials` secret
-2. Queries all clients in the `forte` realm
-3. Filters clients with `k8s.secret.sync: "true"` attribute
-4. For each matching client, retrieves the auto-generated secret via Keycloak Admin API
-5. Creates/updates a K8s Secret in the target namespace (from `k8s.secret.namespace` attribute)
-6. Always writes a central copy to the `secrets` namespace
-
-*Self-service path (new clients):*
-1. Lists Secrets in `keycloak` namespace with label `keycloak.forteapps.net/client-config=true`
-2. For each config Secret, parses `client.json` and computes a config hash
-3. Skips if hash matches annotation and credential Secret already exists
-4. Creates or updates the Keycloak client via Admin API
-5. Fetches the generated client secret
-6. Upserts credential Secret in target namespace + central `secrets` namespace
-7. Annotates config Secret with sync status, config hash, and timestamp
-
-**Resources**:
- `ServiceAccount`: `keycloak-client-registrar` (namespace: `keycloak`)
- `ClusterRole`: `keycloak-client-registrar` (secrets: get/list/create/update/patch; namespaces: get/list)
- `ClusterRoleBinding`: `keycloak-client-registrar`
- `CronJob`: `keycloak-client-registrar`
-
-**Kyverno Policy**: `keycloak-client-config-cloner` — clones labeled Secrets from app namespaces to `keycloak` namespace (see [Kyverno Policies](#kyverno-policies))
-
-**Legacy Client Attributes** (set in `forte-realm.json`):
-
-| Attribute | Required | Default | Description |
-|-----------|----------|---------|-------------|
-| `k8s.secret.sync` | Yes | — | Set to `"true"` to enable syncing |
-| `k8s.secret.namespace` | Yes | — | Target K8s namespace |
-| `k8s.secret.name` | Yes | — | Name of the K8s Secret |
-| `k8s.secret.client-id-key` | No | `client-id` | Field name for client ID in the Secret |
-| `k8s.secret.client-secret-key` | No | `client-secret` | Field name for client secret in the Secret |
-
-**Self-Service Config Secret Schema**:
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: keycloak-client-<app>
-  namespace: <app-namespace>
-  labels:
-    keycloak.forteapps.net/client-config: "true"
-stringData:
-  client.json: |
-    {
-      "clientId": "<app>",
-      "name": "<App Name>",
-      "redirectUris": ["https://<app>.forteapps.net/*"],
-      "webOrigins": ["https://<app>.forteapps.net"],
-      "defaultClientScopes": ["openid", "email", "profile"],
-      "protocolMappers": [],
-      "secret": {
-        "namespace": "<app-namespace>",
-        "name": "<app>-oidc-credentials",
-        "keys": { "clientId": "client-id", "clientSecret": "client-secret" }
-      }
-    }
-```
-
-**Created Credential Secret Format**:
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: <target-name>
-  namespace: <target-namespace>
-  labels:
-    app.kubernetes.io/managed-by: keycloak-client-registrar
-type: Opaque
-data:
-  <client-id-key>: <base64-encoded client ID>
-  <client-secret-key>: <base64-encoded client secret>
-```
-
-**Config Secret Annotations** (set by registrar):
-
-| Annotation | Description |
-|-----------|-------------|
-| `keycloak.forteapps.net/config-hash` | SHA-256 hash of client.json for change detection |
-| `keycloak.forteapps.net/sync-status` | `synced` or `error` |
-| `keycloak.forteapps.net/last-sync` | ISO 8601 timestamp of last successful sync |
-
-**Verification**:
-```bash
-# Check CronJob status
-kubectl get cronjobs -n keycloak
-
-# View latest registrar logs
-kubectl logs -n keycloak job/$(kubectl get jobs -n keycloak --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}')
-
-# Verify created secret
-kubectl get secret <name> -n <namespace> -o yaml
-
-# Check config Secret annotations (self-service)
-kubectl get secret keycloak-client-<app> -n keycloak -o jsonpath='{.metadata.annotations}'
-```
-
-**See**: [Developer Guide - Adding a New Keycloak Client](DEVELOPER-GUIDE.md#adding-a-new-keycloak-client)
-
-### Karpor
-
-**Chart**: `karpor` from `https://kusionstack.github.io/charts`
-**Version**: 0.7.6 (app v0.6.4)
-**Namespace**: `karpor`
-**Sync Wave**: 1
-
-**Purpose**: Kubernetes visualization and intelligence tool. Provides cross-cluster resource search, compliance checking, and topology visualization. Gives platform engineers a unified view of all cluster resources and their relationships.
-
-**Architecture** (4 components):
- **Server** — main Karpor API/UI (port 7443)
- **Syncer** — syncs cluster state into the search index
- **ElasticSearch** — search backend for resource indexing
- **etcd** — persistent key-value store (10Gi PVC)
-
-**Configuration** (`infra/values/base/karpor-values.yaml`):
- `namespaceEnabled: false` — ArgoCD manages namespace creation
- Default resource limits tuned for small clusters
- ElasticSearch: 2 CPU / 4Gi memory (the heaviest component)
- AI features available but not enabled (requires `server.ai.authToken` + backend config)
-
-**Access**: Port-forward to reach the UI:
-```bash
-kubectl port-forward svc/karpor-release-server -n karpor 7443:7443
-# Open https://localhost:7443
-```
-
 ### Renovate

 **Chart**: `renovate` (OCI: `ghcr.io/renovatebot/charts`)
@@ -1255,9 +880,9 @@ kubectl port-forward svc/karpor-release-server -n karpor 7443:7443

 **Configuration**:
 ```yaml
-# infra/base/renovate.yaml + infra/values/base/renovate-values.yaml
+# infra/renovate.yaml + infra/values/renovate-values.yaml
 cronjob:
-  schedule: "@daily"
+  schedule: "@hourly"
  concurrencyPolicy: Forbid

 renovate:
@@ -1266,24 +891,12 @@ renovate:
    endpoint: https://git.forteapps.net
    autodiscover: true
    gitAuthor: "Renovate Bot <renovate@forteapps.net>"
-    packageRules:
-      - matchRepositories: ["**/10x"]
-        assignees: ["edvard.unsvag"]
-        reviewers: ["edvard.unsvag"]
-      - matchRepositories: ["**/auth-sidecar"]
-        assignees: ["danijel.simeunovic"]
-        reviewers: ["danijel.simeunovic"]
-      - matchRepositories: ["**/forte-helm"]
-        assignees: ["danijel.simeunovic"]
-        reviewers: ["danijel.simeunovic"]

 resources:
-  requests: { cpu: 500m, memory: 1Gi }
-  limits: { cpu: "2", memory: 4Gi }
+  requests: { cpu: 250m, memory: 512Mi }
+  limits: { cpu: "1", memory: 1Gi }
 ```

-**Note**: Assignees and reviewers are only applied at PR creation time. Existing PRs must be closed and recreated for new assignment rules to take effect.
-
 **Secrets**: `renovate-env` (SealedSecret in `secrets` namespace, cloned by Kyverno) containing:
 - `RENOVATE_TOKEN` — Gitea PAT with repo write + issue write permissions
 - `RENOVATE_GITHUB_COM_TOKEN` — GitHub PAT (public_repo read-only) for changelog fetching
@@ -1334,19 +947,6 @@ spec:

 **Label Requirement**: Secrets must have `allowedToBeCloned: "true"`

-### Keycloak Client Config Cloner
-
-**File**: `cluster-resources/policies/keycloak-client-cloner.yaml`
-
-**Purpose**: Clones Secrets labeled `keycloak.forteapps.net/client-config: "true"` from app namespaces to the `keycloak` namespace. This allows apps to declare their OIDC client configuration in their own namespace, which the [Keycloak Client Registrar](#keycloak-client-registrar) then processes.
-
-**Trigger**: Any Secret with label `keycloak.forteapps.net/client-config: "true"` created outside the `keycloak` namespace.
-
-**Behavior**:
- Generates a copy of the Secret in the `keycloak` namespace with the same name
- Adds source tracking annotations (`keycloak.forteapps.net/source-namespace`, `keycloak.forteapps.net/source-name`)
- `synchronize: true` — changes to the source Secret are reflected in the clone
-
 ### Default Namespace Blocker

 **File**: `cluster-resources/policies/default-ns-blocker.yaml`
@@ -1691,23 +1291,7 @@ Forward to Application (localhost:3000)
 Application processes request
 ```

-#### Forwarded Headers
-
-After successful authentication, the sidecar injects user identity as HTTP headers before forwarding the request to the application container:
-
-| Header | Description | Auth Modes |
-|--------|-------------|------------|
-| `X-Auth-User` | Username or display name | Token, OIDC, MCP |
-| `X-Auth-Email` | User email address | OIDC |
-| `X-Auth-Subject` | OIDC `sub` claim (stable user ID) | OIDC, MCP |
-| `X-Auth-Groups` | Comma-separated group memberships | OIDC (if `groups` scope) |
-| `X-Auth-Token` | The validated access token | All modes |
-
-These headers are trustworthy because the auto-generated `NetworkPolicy` restricts pod ingress to the sidecar port only — external traffic cannot reach the application container directly, so headers cannot be spoofed.
-
-Applications should read these headers to obtain authenticated user information (e.g. for display, authorisation decisions, or audit logging) instead of implementing their own authentication.
-
-**See**: [Developer Guide - Accessing Authenticated User Information](DEVELOPER-GUIDE.md#accessing-authenticated-user-information) for code examples.
+**See**: [Developer Guide - Enabling Authentication](DEVELOPER-GUIDE.md#enabling-authentication-for-applications) for usage examples.

 ---

@@ -1741,22 +1325,14 @@ Recommended resource allocation:

 ### Storage Classes

-Storage classes are cloud-specific and configured in per-cluster value overrides (`infra/values/{cluster}/gitea-values.yaml`):
-
-| Cloud | Storage Class | Driver |
-|-------|--------------|--------|
-| **UpCloud** | `upcloud-block-storage-maxiops` | UpCloud CSI |
-| **AWS EKS** | `gp3` | EBS CSI |
-| **Azure AKS** | `managed-csi-premium` | Azure Disk CSI |
-| **GCP GKE** | `premium-rwo` | PD CSI |
+Default storage class used: **UpCloud default** (varies by provider)

 ```yaml
-# Example: base values omit storageClass (set in per-cluster overlay)
 persistence:
  enabled: true
+  storageClass: ""     # Uses default
  accessMode: ReadWriteOnce
  size: 5Gi
-  # storageClass set by infra/values/{cluster}/gitea-values.yaml
 ```

 ---
@@ -1820,88 +1396,6 @@ POST /loki/api/v1/push

 ---

-## Cloud Overlay Pattern
-
-### Overview
-
-Cloud-specific configuration (StorageClass, LoadBalancer annotations, pricing models, etc.) lives in per-cloud overlay value files, **not** in `base/`. Adding a new cloud provider only requires a new overlay directory — no base changes.
-
-### Supported Clouds
-
-| Cloud | Dev overlay | Prod overlay | StorageClass | LB type |
-|-------|-----------|-------------|-------------|---------|
-| **UpCloud** | `upc-dev` | `upc-prod` | `upcloud-block-storage-maxiops` | UpCloud LB (proxy protocol v2) |
-| **Azure AKS** | `aks-dev` | `aks-prod` | `managed-csi-premium` | Azure LB |
-| **AWS EKS** | `eks-dev` | `eks-prod` | `gp3` | AWS NLB (proxy protocol) |
-| **GCP GKE** | `gke-dev` | `gke-prod` | `premium-rwo` | GCP NEG |
-
-Bootstrap any cluster with: `./bootstrap.sh <cluster>` (e.g., `./bootstrap.sh aks-dev`)
-
-### How It Works
-
-Each ArgoCD Application uses **multi-source Helm values** with two value files:
-
-```yaml
-# infra/base/gitea.yaml (example)
-helm:
-  valueFiles:
-  - $values/infra/values/base/gitea-values.yaml      # [0] cloud-agnostic
-  - $values/infra/values/upc-dev/gitea-values.yaml    # [1] cloud-specific (default: upc-dev)
-```
-
-The `upc-prod` Kustomize overlay patches index `[1]` to swap the cloud-specific file:
-
-```yaml
-# infra/overlays/upc-prod/kustomization.yaml
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/gitea-values.yaml
-```
-
-### Components Using Cloud Overlays
-
-| Component | Cloud-specific config | Overlay value file |
-|-----------|----------------------|-------------------|
-| **Traefik** | LB annotations, proxy protocol IPs | `traefik-values.yaml` |
-| **Keycloak** | Hostname, TLS settings | `keycloak-values.yaml` |
-| **Grafana** | Hostname, datasource URLs | `grafana-values.yaml` |
-| **Gitea** | StorageClass (persistence + PostgreSQL) | `gitea-values.yaml` |
-| **OpenCost** | Custom pricing model (CPU/RAM/storage rates) | `opencost-values.yaml` |
-
-### Backup CronJob
-
-The `gitea-backup` CronJob uses a generic `s3` alias for `minio/mc`. The actual endpoint and credentials come from the `gitea-backup-s3` Sealed Secret, which is per-cloud. Reference scripts for different cloud providers are in `scripts/backup/`:
-
-| Script | Provider | Tool |
-|--------|----------|------|
-| `s3-minio.sh` | S3-compatible (UpCloud, MinIO, Wasabi) | `minio/mc` |
-| `aws-s3.sh` | AWS S3 | `aws` CLI |
-| `azure-blob.sh` | Azure Blob Storage | `az` CLI |
-| `gcp-gcs.sh` | GCP Cloud Storage | `gsutil` |
-
-### Adding a New Cloud Provider
-
-To add support for a new cloud (e.g., `oci-dev` for Oracle Cloud):
-
-1. **Cluster config**: `clusters/oci-dev.yaml` — clusterName, domain, trustedIPs, cloudProvider
-2. **Overlay value files** in `infra/values/oci-dev/`:
-   - `traefik-values.yaml` — LB annotations, proxy protocol config
-   - `keycloak-values.yaml` — hostname
-   - `grafana-values.yaml` — hostname
-   - `gitea-values.yaml` — `storageClass` for persistence + PostgreSQL
-   - `opencost-values.yaml` — pricing model or cloud billing integration
-3. **Kustomize overlay**: `infra/overlays/oci-dev/kustomization.yaml` — patch `valueFiles[1]` for each Application
-4. **App-of-apps**: `_app-of-apps-oci-dev.yaml` — points to `infra/overlays/oci-dev`
-5. **Secrets overlay**: `secrets/overlays/oci-dev/kustomization.yaml` — references `../../base`, add cloud-specific SealedSecrets if needed
-6. **Secrets patch**: Add patch to `infra/overlays/oci-dev/kustomization.yaml` to swap secrets path to `secrets/overlays/oci-dev`
-7. **Bootstrap**: `./bootstrap.sh oci-dev`
-
---
-
 ## Glossary

 ### Terms
@@ -2034,6 +1528,6 @@ team: platform

 ---

-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-04-14
 **Maintained By**: Platform Team
 **Version**: 1.0.0
--- a/infra/base/karpor.yaml
+++ b/infra/base/karpor.yaml
@@ -1,48 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: karpor
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "1"
-  labels:
-    app.kubernetes.io/name: karpor
-    app.kubernetes.io/part-of: developer-portal
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://kusionstack.github.io/charts
-    chart: karpor
-    targetRevision: "0.7.6"
-    helm:
-      releaseName: karpor
-      valueFiles:
-      - $values/infra/values/base/karpor-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: karpor
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates
--- a/infra/base/kustomization.yaml
+++ b/infra/base/kustomization.yaml
@@ -1,23 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- traefik-application.yaml
- keycloak.yaml
- grafana.yaml
- cert-manager-application.yaml
- kyverno.yaml
- sealedsecrets.yaml
- prometheus.yaml
- loki.yaml
- fluent-bit.yaml
- enterprise-apps.yaml
- cluster-resources-application.yaml
- kyverno-policies.yaml
- secrets.yaml
- gitea.yaml
- gitea-actions.yaml
- opencost.yaml
- renovate.yaml
- tempo.yaml
- grafana-dashboards.yaml
- karpor.yaml
--- a/infra/base/traefik-application.yaml
+++ b/infra/base/traefik-application.yaml
@@ -1,51 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: traefik-system
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: traefik
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "1"
-  labels:
-    app.kubernetes.io/name: traefik
-    app.kubernetes.io/part-of: platform
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://traefik.github.io/charts
-    chart: traefik
-    targetRevision: "28.0.0"
-    helm:
-      releaseName: traefik
-      valueFiles:
-      - $values/infra/values/base/traefik-values.yaml
-      - $values/infra/values/upc-dev/traefik-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: traefik-system
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true
--- a/infra/base/cert-manager-application.yaml
+++ b/infra/base/cert-manager-application.yaml
--- a/infra/base/cluster-resources-application.yaml
+++ b/infra/base/cluster-resources-application.yaml
--- a/infra/dashboards/kustomization.yaml
+++ b/infra/dashboards/kustomization.yaml
@@ -8,6 +8,9 @@ generatorOptions:
    grafana_dashboard: "1"

 configMapGenerator:
+- name: grafana-dashboard-trivy
+  files:
+  - trivy.json
 - name: grafana-dashboard-traefik-loki
  files:
  - traefik-loki.json
--- a/infra/dashboards/trivy.json
+++ b/infra/dashboards/trivy.json
--- a/infra/base/enterprise-apps.yaml
+++ b/infra/base/enterprise-apps.yaml
@@ -18,7 +18,7 @@ spec:
  source:
    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
-    path: apps/overlays/upc-dev
+    path: apps
  destination:
    server: https://kubernetes.default.svc
    namespace: apps
--- a/infra/base/fluent-bit.yaml
+++ b/infra/base/fluent-bit.yaml
@@ -21,7 +21,7 @@ spec:
    helm:
      releaseName: fluent-bit
      valueFiles:
-      - $values/infra/values/base/fluent-bit-values.yaml
+      - $values/infra/values/fluent-bit-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/base/gitea-actions.yaml
+++ b/infra/base/gitea-actions.yaml
@@ -21,7 +21,7 @@ spec:
    helm:
      releaseName: gitea-actions
      valueFiles:
-      - $values/infra/values/base/gitea-actions-values.yaml
+      - $values/infra/values/gitea-actions-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/base/gitea.yaml
+++ b/infra/base/gitea.yaml
@@ -21,8 +21,7 @@ spec:
    helm:
      releaseName: gitea
      valueFiles:
-      - $values/infra/values/base/gitea-values.yaml
-      - $values/infra/values/upc-dev/gitea-values.yaml
+      - $values/infra/values/gitea-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/base/grafana-dashboards.yaml
+++ b/infra/base/grafana-dashboards.yaml
--- a/infra/base/grafana.yaml
+++ b/infra/base/grafana.yaml
@@ -21,8 +21,7 @@ spec:
    helm:
      releaseName: grafana
      valueFiles:
-      - $values/infra/values/base/grafana-values.yaml
-      - $values/infra/values/upc-dev/grafana-values.yaml
+      - $values/infra/values/grafana-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/base/keycloak.yaml
+++ b/infra/base/keycloak.yaml
@@ -15,14 +15,13 @@ spec:
  project: default

  sources:
-  - repoURL: registry-1.docker.io/bitnamicharts
+  - repoURL: https://charts.bitnami.com/bitnami
    chart: keycloak
    targetRevision: "25.2.0"
    helm:
      releaseName: keycloak
      valueFiles:
-      - $values/infra/values/base/keycloak-values.yaml
-      - $values/infra/values/upc-dev/keycloak-values.yaml
+      - $values/infra/values/keycloak-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
@@ -41,13 +40,3 @@ spec:
    - CreateNamespace=true
    - Validate=true
    - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: batch
-    kind: CronJob
-    jsonPointers:
-    - /spec/jobTemplate/spec/template/spec/containers/0/args
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates
--- a/infra/base/kyverno-policies.yaml
+++ b/infra/base/kyverno-policies.yaml
--- a/infra/base/kyverno.yaml
+++ b/infra/base/kyverno.yaml
--- a/infra/base/loki.yaml
+++ b/infra/base/loki.yaml
@@ -21,7 +21,7 @@ spec:
    helm:
      releaseName: loki
      valueFiles:
-      - $values/infra/values/base/loki-values.yaml
+      - $values/infra/values/loki-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
@@ -40,9 +40,3 @@ spec:
    - CreateNamespace=true
    - Validate=true
    - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates
--- a/infra/network-policies-application.yaml
+++ b/infra/network-policies-application.yaml
@@ -1,32 +1,33 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: infrastructure-apps
+  name: network-policies
  namespace: argocd
  labels:
-    app.kubernetes.io/name: infrastructure-apps
+    app.kubernetes.io/name: network-policies
    app.kubernetes.io/part-of: platform
+    app.kubernetes.io/managed-by: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
  finalizers:
  - resources-finalizer.argocd.argoproj.io
 spec:
  project: default
+
  source:
    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
-    path: infra/overlays/eks-dev
+    path: cluster-resources/network
+
  destination:
    server: https://kubernetes.default.svc
-    namespace: default
+
  syncPolicy:
    automated:
      prune: true
      selfHeal: true
+      allowEmpty: false
+
    syncOptions:
-    - CreateNamespace=true
+    - Validate=true
+    - ServerSideApply=true
--- a/infra/base/opencost.yaml
+++ b/infra/base/opencost.yaml
@@ -21,8 +21,7 @@ spec:
    helm:
      releaseName: opencost
      valueFiles:
-      - $values/infra/values/base/opencost-values.yaml
-      - $values/infra/values/upc-dev/opencost-values.yaml
+      - $values/infra/values/opencost-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/overlays/aks-dev/kustomization.yaml
+++ b/infra/overlays/aks-dev/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/traefik-values.yaml
-
-# Keycloak: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/keycloak-values.yaml
-
-# Grafana: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/grafana-values.yaml
-
-# Gitea: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/gitea-values.yaml
-
-# OpenCost: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/opencost-values.yaml
-
-# Secrets: change path to aks-dev
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/aks-dev
-
-# Enterprise-apps: point to aks-dev overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/aks-dev
--- a/infra/overlays/aks-prod/kustomization.yaml
+++ b/infra/overlays/aks-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/opencost-values.yaml
-
-# Secrets: change path to aks-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/aks-prod
-
-# Enterprise-apps: point to aks-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/aks-prod
--- a/infra/overlays/eks-dev/kustomization.yaml
+++ b/infra/overlays/eks-dev/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/traefik-values.yaml
-
-# Keycloak: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/keycloak-values.yaml
-
-# Grafana: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/grafana-values.yaml
-
-# Gitea: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/gitea-values.yaml
-
-# OpenCost: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/opencost-values.yaml
-
-# Secrets: change path to eks-dev
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/eks-dev
-
-# Enterprise-apps: point to eks-dev overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/eks-dev
--- a/infra/overlays/eks-prod/kustomization.yaml
+++ b/infra/overlays/eks-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/opencost-values.yaml
-
-# Secrets: change path to eks-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/eks-prod
-
-# Enterprise-apps: point to eks-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/eks-prod
--- a/infra/overlays/gke-dev/kustomization.yaml
+++ b/infra/overlays/gke-dev/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/traefik-values.yaml
-
-# Keycloak: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/keycloak-values.yaml
-
-# Grafana: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/grafana-values.yaml
-
-# Gitea: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/gitea-values.yaml
-
-# OpenCost: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/opencost-values.yaml
-
-# Secrets: change path to gke-dev
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/gke-dev
-
-# Enterprise-apps: point to gke-dev overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/gke-dev
--- a/infra/overlays/gke-prod/kustomization.yaml
+++ b/infra/overlays/gke-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/opencost-values.yaml
-
-# Secrets: change path to gke-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/gke-prod
-
-# Enterprise-apps: point to gke-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/gke-prod
--- a/infra/overlays/upc-dev/kustomization.yaml
+++ b/infra/overlays/upc-dev/kustomization.yaml
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-# No patches needed — base already has "upc-dev" paths
-# upc-dev is the default/base cluster
--- a/infra/overlays/upc-prod/kustomization.yaml
+++ b/infra/overlays/upc-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → upc-prod in valueFiles
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → upc-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → upc-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → upc-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → upc-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/opencost-values.yaml
-
-# Secrets: change path to upc-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/overlays/upc-prod
-
-# Enterprise-apps: point to upc-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/upc-prod
--- a/infra/base/prometheus.yaml
+++ b/infra/base/prometheus.yaml
@@ -21,7 +21,7 @@ spec:
    helm:
      releaseName: prometheus
      valueFiles:
-      - $values/infra/values/base/prometheus-values.yaml
+      - $values/infra/values/prometheus-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/base/renovate.yaml
+++ b/infra/base/renovate.yaml
@@ -21,7 +21,7 @@ spec:
    helm:
      releaseName: renovate
      valueFiles:
-      - $values/infra/values/base/renovate-values.yaml
+      - $values/infra/values/renovate-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
--- a/infra/base/sealedsecrets.yaml
+++ b/infra/base/sealedsecrets.yaml
--- a/infra/base/secrets.yaml
+++ b/infra/base/secrets.yaml
@@ -18,7 +18,7 @@ spec:
  project: default
  source:
    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    path: secrets/overlays/upc-dev
+    path: secrets
  destination:
    server: https://kubernetes.default.svc
    namespace: secrets
--- a/infra/base/tempo.yaml
+++ b/infra/base/tempo.yaml
@@ -21,7 +21,7 @@ spec:
    helm:
      releaseName: tempo
      valueFiles:
-      - $values/infra/values/base/tempo-values.yaml
+      - $values/infra/values/tempo-values.yaml

  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
    targetRevision: HEAD
@@ -40,9 +40,3 @@ spec:
    - CreateNamespace=true
    - Validate=true
    - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates
--- a/infra/traefik-application.yaml
+++ b/infra/traefik-application.yaml
@@ -0,0 +1,159 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: traefik-system
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: traefik
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+  labels:
+    app.kubernetes.io/name: traefik
+    app.kubernetes.io/part-of: platform
+    app.kubernetes.io/managed-by: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+
+  source:
+    repoURL: https://traefik.github.io/charts
+    chart: traefik
+    targetRevision: "28.0.0"
+
+    helm:
+      values: |
+        metrics:
+          addInternals: true
+        tracing:
+          otlp:
+            enabled: true
+        logs:
+          general:
+            level: DEBUG
+          access:
+            format: json
+            enabled: true
+
+        additionalArguments:
+          - "--tracing.otlp.http.endpoint=http://tempo.monitoring.svc.cluster.local:4318/v1/traces"
+
+        providers:
+          kubernetesIngress:
+            publishedService: # Fixes ArgoCD health checks for LoadBalancer services
+              enabled: true
+        deployment:
+          replicas: 2
+
+        ingressRoute:
+          dashboard:
+            enabled: true
+            # Optional: specify entrypoint
+            entrypoint: traefik
+
+        api:
+          dashboard: true
+          debug: false
+
+        service:
+          type: LoadBalancer
+          annotations:
+            traefik.ingress.kubernetes.io/router.entrypoints: websecure
+            traefik.ingress.kubernetes.io/router.priority: "42"
+            traefik.ingress.kubernetes.io/router.tls: "true"
+            service.beta.kubernetes.io/upcloud-load-balancer-config: |
+              {
+                  "frontends": [
+                      {
+                          "name": "web",
+                          "mode": "tcp"
+                      },
+                      {
+                          "name": "websecure",
+                          "mode": "tcp"
+                      },
+                      {
+                          "name": "giteassh",
+                          "mode": "tcp"
+                      }
+                  ],
+                  "backends": [
+                      {
+                          "name": "web",
+                          "properties": {
+                              "outbound_proxy_protocol": "v2"
+                          }
+                      },
+                      {
+                          "name": "websecure",
+                          "properties": {
+                              "outbound_proxy_protocol": "v2"
+                          }
+                      },
+                      {
+                          "name": "giteassh"
+                      }
+                  ]
+              }
+
+        ingressClass:
+          enabled: true
+          isDefaultClass: true
+
+        # Configure entry points
+        ports:
+          metrics:
+            expose: 
+              default: true
+            observability:
+              accessLogs: true
+              metrics: true
+              tracing: true
+              traceVerbosity: detailed
+          web:
+            proxyProtocol:
+              trustedIPs: "172.16.1.0/24"
+            forwardedHeaders:
+              trustedIPs: "172.16.1.0/24"
+            http:
+              redirections:
+                entrypoint:
+                  to: websecure
+                  scheme: https
+
+          websecure:
+            proxyProtocol:
+              trustedIPs: "172.16.1.0/24"
+            forwardedHeaders:
+              trustedIPs: "172.16.1.0/24"
+            observability:
+              accessLogs: true
+              metrics: true
+              tracing: true
+
+          giteassh:
+            port: 2222
+            expose:
+              default: true
+            exposedPort: 2222
+            protocol: TCP
+
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: traefik-system
+
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+      allowEmpty: false
+
+    syncOptions:
+    - CreateNamespace=true
+    - Validate=true
+    - ServerSideApply=true
--- a/infra/trivy.yaml
+++ b/infra/trivy.yaml
@@ -0,0 +1,67 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: trivy-system
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: trivy-operator
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+  labels:
+    app.kubernetes.io/name: trivy-operator
+    app.kubernetes.io/part-of: platform
+    app.kubernetes.io/managed-by: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+
+  source:
+    repoURL: https://aquasecurity.github.io/helm-charts
+    chart: trivy-operator
+    targetRevision: 0.31.0
+    helm:
+      releaseName: trivy-operator
+      valuesObject:
+        operator:
+          targetNamespaces: ""
+          excludeNamespaces: "argocd,trivy-system,kube-system,monitoring,kyverno,cert-manager"
+          scanJobsInSameNamespace: true
+          metricsVulnIdEnabled: true
+          metricsImageInfo: true
+        trivy:
+          ignoreUnfixed: false
+
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: trivy-system
+
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+      allowEmpty: false
+    syncOptions:
+    - CreateNamespace=true
+    - Validate=true
+    - ServerSideApply=true
+    retry:
+      limit: 5
+      backoff:
+        duration: 5s
+        factor: 2
+        maxDuration: 3m
+
+  ignoreDifferences:
+  - group: apiextensions.k8s.io
+    kind: CustomResourceDefinition
+    jsonPointers:
+    - /metadata/labels
+    - /metadata/annotations
+    - /metadata/finalizers
--- a/infra/values/aks-dev/gitea-values.yaml
+++ b/infra/values/aks-dev/gitea-values.yaml
@@ -1,7 +0,0 @@
-# AKS-specific: Azure managed disk storage class
-persistence:
-  storageClass: managed-csi-premium
-postgresql:
-  primary:
-    persistence:
-      storageClass: managed-csi-premium
--- a/infra/values/aks-dev/grafana-values.yaml
+++ b/infra/values/aks-dev/grafana-values.yaml
@@ -1,4 +0,0 @@
-# AKS-specific: Grafana hostname
-ingress:
-  hosts:
-  - grafana.forteapps.net
--- a/infra/values/aks-dev/keycloak-values.yaml
+++ b/infra/values/aks-dev/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# AKS-specific: Keycloak hostname
-ingress:
-  hostname: id.forteapps.net
--- a/infra/values/aks-dev/opencost-values.yaml
+++ b/infra/values/aks-dev/opencost-values.yaml
@@ -1,8 +0,0 @@
-# AKS-specific: Azure pricing via Cloud Billing API
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    azure:
-      secretName: opencost-azure-billing
--- a/infra/values/aks-dev/traefik-values.yaml
+++ b/infra/values/aks-dev/traefik-values.yaml
@@ -1,11 +0,0 @@
-# AKS-specific: Azure Load Balancer for Traefik
-service:
-  annotations:
-    service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /ping
-ports:
-  web:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/aks-prod/gitea-values.yaml
+++ b/infra/values/aks-prod/gitea-values.yaml
@@ -1,7 +0,0 @@
-# AKS-specific: Azure managed disk storage class (prod)
-persistence:
-  storageClass: managed-csi-premium
-postgresql:
-  primary:
-    persistence:
-      storageClass: managed-csi-premium
--- a/infra/values/aks-prod/grafana-values.yaml
+++ b/infra/values/aks-prod/grafana-values.yaml
@@ -1,4 +0,0 @@
-# AKS-specific: Grafana hostname (prod)
-ingress:
-  hosts:
-  - grafana.fortedigital.com
--- a/infra/values/aks-prod/keycloak-values.yaml
+++ b/infra/values/aks-prod/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# AKS-specific: Keycloak hostname (prod)
-ingress:
-  hostname: id.fortedigital.com
--- a/infra/values/aks-prod/opencost-values.yaml
+++ b/infra/values/aks-prod/opencost-values.yaml
@@ -1,8 +0,0 @@
-# AKS-specific: Azure pricing via Cloud Billing API (prod)
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    azure:
-      secretName: opencost-azure-billing
--- a/infra/values/aks-prod/traefik-values.yaml
+++ b/infra/values/aks-prod/traefik-values.yaml
@@ -1,12 +0,0 @@
-# AKS-specific: Azure Load Balancer for Traefik (prod)
-service:
-  annotations:
-    service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /ping
-    service.beta.kubernetes.io/azure-load-balancer-internal: "false"
-ports:
-  web:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/argocd-values.yaml
+++ b/infra/values/argocd-values.yaml
@@ -0,0 +1,85 @@
+global:
+  domain: argocd.127.0.0.1.nip.io
+configs:
+  secret:
+    createSecret: true
+    argocdServerAdminPassword: "$2b$12$Tmb1jH7ADvwWoUoNPXXsfOf6JqEluqhq8mL06a8DGT2AP1GzbNsCm"
+  cm:
+    application.resourceTrackingMethod: annotation
+    timeout.reconciliation: 60s
+    admin.enabled: "true"
+  params:
+    "server.insecure": true
+server:
+  ingress:
+    enabled: false
+    ingressClassName: nginx
+  extraArgs:
+  - --insecure
+
+notifications:
+  # Don't create secret via Helm - using SealedSecret instead
+  secret:
+    create: false
+
+  # Shared context variables available in all templates
+  context:
+    clusterName: "dev-fd-no-svg1"
+
+  # Define notification templates
+  templates:
+    template.app-syncing: |
+      webhook:
+        slack:
+          method: POST
+          body: |
+            {
+              "payload": "🖥️ {{ .context.clusterName }}: 🔄 *{{ .app.metadata.name }}* is syncing...\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}"
+            }
+    template.app-sync-succeeded: |
+      webhook:
+        slack:
+          method: POST
+          body: |
+            {
+              "payload": "🖥️ {{ .context.clusterName }}: ✅ *{{ .app.metadata.name }}* sync succeeded\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}{{ range .app.status.summary.images }}\n🏷️  Image: {{ . }}{{ end }}"
+            }
+    template.app-sync-failed: |
+      webhook:
+        slack:
+          method: POST
+          body: |
+            {
+              "payload": "🖥️ {{ .context.clusterName }}: ❌ *{{ .app.metadata.name }}* sync failed\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}\n⚠️  Message: {{ .app.status.operationState.message }}"
+            }
+    template.app-degraded: |
+      webhook:
+        slack:
+          method: POST
+          body: |
+            {
+              "payload": "🖥️ {{ .context.clusterName }}: ⚠️ *{{ .app.metadata.name }}* is degraded\n🏥 Health: {{ .app.status.health.status }}\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}{{ range .app.status.summary.images }}\n🏷️  Image: {{ . }}{{ end }}"
+            }
+
+  # Define notification triggers
+  triggers:
+    trigger.on-sync-running: |
+      - when: app.status.operationState.phase in ['Running']
+        send: [app-syncing]
+    trigger.on-sync-succeeded: |
+      - when: app.status.operationState.phase in ['Succeeded'] and app.status.health.status == 'Healthy'
+        send: [app-sync-succeeded]
+    trigger.on-sync-failed: |
+      - when: app.status.operationState.phase in ['Failed']
+        send: [app-sync-failed]
+    trigger.on-degraded: |
+      - when: app.status.health.status == 'Degraded'
+        send: [app-degraded]
+
+  # Define notification services (webhook for Slack)
+  notifiers:
+    service.webhook.slack: |
+      url: $slack-webhook-url
+      headers:
+      - name: Content-Type
+        value: application/json
--- a/infra/values/base/argocd-values.yaml
+++ b/infra/values/base/argocd-values.yaml
@@ -1,148 +0,0 @@
-configs:
-  secret:
-    createSecret: true
-    argocdServerAdminPassword: "$2b$12$Tmb1jH7ADvwWoUoNPXXsfOf6JqEluqhq8mL06a8DGT2AP1GzbNsCm"
-    # oidc.clientSecret managed by argocd-oidc-sync CronJob
-    # (reads from argocd-oidc-credentials, patches argocd-secret)
-  ssh:
-    knownHosts: |
-      [git.forteapps.net]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTwi40de8yTGUuRT0i/XGicQ672BLhYR6D/lDquJrp/tdrWoZhVVPy0wxSkWsq1V92iiAUuQnXagOGsLBGZT9uDLWKvEmNDnCfjzTMq3J1iA3vk2rQ8WBlCzhvmeCV/r0ufl6vsgfwxSRomLZeqa2UkLHx69gy2Njb1S2/aZK1Q53f466hCUfDULZrTn2Nn5Sj8cEbJ8EyvVN2YG9HYBxQdzKRPZEmS1vyzmn8YrYIkZseIRQElabzWGh86owuaaqnwJhTJj1j2sEUeIet04sGKJcnxx2UL4H90N66LKMldmMiuli+ve/CjJmMwDl0zGkjIniT3XR8CyEXYHli7B1hR8Z+dbK6DBgjz+28lFgMIRY70KkZJNsJcBNZLZ5fHwCI13a9U3Uhg3Pu/6s0zlosM4CrAQNQCRe95ZPtCpdFhlGrOl4m1rdSK2meL6rND0TBBuZbaFF6Py7TawLCAiO2KRaVqhu9OFVjwJ/nifgLzFGwWj+WcYmpuR+DwozrF/Hl7QYsz1x4GO1SONY07KbIFkUCHOMAh0AELY5YE4eGI4mtG6SecdPaAdLREGZYK4IcyP5i1QW9g0wmfRSsV9jy+r0ivBxixxh4yJiNpkg6NXak40gQtGIme9EJ+DxrRLruNsfDILWcdSuH/wvuorv56NpQFGB0FzB6LXMloSYptQ==
-  cm:
-    application.resourceTrackingMethod: annotation
-    timeout.reconciliation: 60s
-    # Admin login disabled — SSO only. Break-glass: kubectl patch cm argocd-cm -n argocd -p '{"data":{"admin.enabled":"true"}}'
-    admin.enabled: "false"
-    url: https://argocd.forteapps.net
-    oidc.config: |
-      name: Forte SSO
-      issuer: https://id.forteapps.net/realms/forte
-      clientID: argocd
-      clientSecret: $oidc.clientSecret
-      requestedScopes: ["openid", "email", "profile"]
-  rbac:
-    # Base RBAC — org-wide roles shared across all clusters.
-    # Per-cluster policies go in infra/values/<cluster>/argocd-values.yaml
-    # as configs.rbac.policy.<cluster>.csv (ArgoCD concatenates all policy.*.csv keys)
-    policy.csv: |
-      # Platform administrators — full control
-      g, ArgoCD Admins, role:admin
-
-      # Read-only viewers — see all, change nothing
-      g, ArgoCD Viewers, role:readonly
-
-      # --- Per-team roles (scoped to default project app names) ---
-      # Observability team — manage monitoring stack
-      p, role:observability, applications, get, default/prometheus, allow
-      p, role:observability, applications, get, default/loki, allow
-      p, role:observability, applications, get, default/fluent-bit, allow
-      p, role:observability, applications, get, default/tempo, allow
-      p, role:observability, applications, get, default/grafana, allow
-      p, role:observability, applications, get, default/grafana-dashboards, allow
-      p, role:observability, applications, get, default/opencost, allow
-      p, role:observability, applications, sync, default/prometheus, allow
-      p, role:observability, applications, sync, default/loki, allow
-      p, role:observability, applications, sync, default/fluent-bit, allow
-      p, role:observability, applications, sync, default/tempo, allow
-      p, role:observability, applications, sync, default/grafana, allow
-      p, role:observability, applications, sync, default/grafana-dashboards, allow
-      p, role:observability, applications, sync, default/opencost, allow
-      p, role:observability, logs, get, default/*, allow
-      g, Observability Team, role:observability
-
-      # Dev tools team — manage gitea, renovate, karpor
-      p, role:devtools, applications, get, default/gitea, allow
-      p, role:devtools, applications, get, default/gitea-actions, allow
-      p, role:devtools, applications, get, default/renovate, allow
-      p, role:devtools, applications, get, default/karpor, allow
-      p, role:devtools, applications, sync, default/gitea, allow
-      p, role:devtools, applications, sync, default/gitea-actions, allow
-      p, role:devtools, applications, sync, default/renovate, allow
-      p, role:devtools, applications, sync, default/karpor, allow
-      p, role:devtools, logs, get, default/*, allow
-      g, Dev Tools Team, role:devtools
-
-      # App developers — manage enterprise apps only
-      p, role:app-dev, applications, get, default/enterprise-apps, allow
-      p, role:app-dev, applications, sync, default/enterprise-apps, allow
-      p, role:app-dev, applications, action, default/enterprise-apps, allow
-      p, role:app-dev, logs, get, default/enterprise-apps, allow
-      g, App Developers, role:app-dev
-
-    # Deny users not in any declared KC group
-    policy.default: ""
-    scopes: '[groups]'
-  params:
-    "server.insecure": true
-    "reposerver.enable.git.submodule": "false"
-server:
-  ingress:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-    tls: true
-  extraArgs:
-  - --insecure
-
-notifications:
-  # Don't create secret via Helm - using SealedSecret instead
-  secret:
-    create: false
-
-  # Define notification templates
-  templates:
-    template.app-syncing: |
-      webhook:
-        slack:
-          method: POST
-          body: |
-            {
-              "payload": "🖥️ {{ .context.clusterName }}: 🔄 *{{ .app.metadata.name }}* is syncing...\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}"
-            }
-    template.app-sync-succeeded: |
-      webhook:
-        slack:
-          method: POST
-          body: |
-            {
-              "payload": "🖥️ {{ .context.clusterName }}: ✅ *{{ .app.metadata.name }}* sync succeeded\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}{{ range .app.status.summary.images }}\n🏷️  Image: {{ . }}{{ end }}"
-            }
-    template.app-sync-failed: |
-      webhook:
-        slack:
-          method: POST
-          body: |
-            {
-              "payload": "🖥️ {{ .context.clusterName }}: ❌ *{{ .app.metadata.name }}* sync failed\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}\n⚠️  Message: {{ .app.status.operationState.message }}"
-            }
-    template.app-degraded: |
-      webhook:
-        slack:
-          method: POST
-          body: |
-            {
-              "payload": "🖥️ {{ .context.clusterName }}: ⚠️ *{{ .app.metadata.name }}* is degraded\n🏥 Health: {{ .app.status.health.status }}\n📦 Revision: {{ .app.status.sync.revision | default `n/a` | substr 0 7 }}{{ range .app.status.summary.images }}\n🏷️  Image: {{ . }}{{ end }}"
-            }
-
-  # Define notification triggers
-  triggers:
-    trigger.on-sync-running: |
-      - when: app.status.operationState.phase in ['Running']
-        send: [app-syncing]
-    trigger.on-sync-succeeded: |
-      - when: app.status.operationState.phase in ['Succeeded'] and app.status.health.status == 'Healthy'
-        send: [app-sync-succeeded]
-    trigger.on-sync-failed: |
-      - when: app.status.operationState.phase in ['Failed']
-        send: [app-sync-failed]
-    trigger.on-degraded: |
-      - when: app.status.health.status == 'Degraded'
-        send: [app-degraded]
-
-  # Define notification services (webhook for Slack)
-  notifiers:
-    service.webhook.slack: |
-      url: $slack-webhook-url
-      headers:
-      - name: Content-Type
-        value: application/json
--- a/infra/values/base/dot-ai-stack-values.yaml
+++ b/infra/values/base/dot-ai-stack-values.yaml
@@ -1,11 +0,0 @@
-dot-ai:
-  ingress:
-    enabled: true
-    className: traefik
-dot-ai-ui:
-  uiAuth:
-    secretRef:
-      name: dot-ai-secrets
-  ingress:
-    enabled: true
-    className: traefik
--- a/infra/values/base/karpor-values.yaml
+++ b/infra/values/base/karpor-values.yaml
@@ -1,44 +0,0 @@
-# Karpor - Kubernetes Visualization & Intelligence Tool
-# Helm chart: https://github.com/KusionStack/charts/tree/master/charts/karpor
-
-# Let the ArgoCD Application manage the namespace
-namespaceEnabled: false
-
-server:
-  replicas: 1
-  port: 7443
-  resources:
-    requests:
-      cpu: 250m
-      memory: 256Mi
-    limits:
-      cpu: 500m
-      memory: 1Gi
-
-syncer:
-  replicas: 1
-  port: 7443
-  resources:
-    requests:
-      cpu: 250m
-      memory: 256Mi
-    limits:
-      cpu: 500m
-      memory: 1Gi
-
-elasticsearch:
-  replicas: 1
-  port: 9200
-  resources:
-    requests:
-      cpu: 500m
-      memory: 2Gi
-    limits:
-      cpu: "2"
-      memory: 4Gi
-
-etcd:
-  replicas: 1
-  port: 2379
-  persistence:
-    size: 5Gi
--- a/infra/values/base/keycloak-values.yaml
+++ b/infra/values/base/keycloak-values.yaml
@@ -1,545 +0,0 @@
-# Bitnami Keycloak Helm Chart Values
-# Chart version: 25.2.0
-
-image:
-  repository: bitnamilegacy/keycloak
-
-production: true
-proxyHeaders: xforwarded
-
-auth:
-  adminUser: admin
-  existingSecret: keycloak-credentials
-  passwordSecretKey: admin-password
-
-ingress:
-  enabled: true
-  tls: true
-  ingressClassName: traefik
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-
-metrics:
-  enabled: true
-  prometheusRule:
-    namespace: monitoring
-    enabled: true
-
-resources:
-  requests:
-    cpu: 250m
-    memory: 512Mi
-  limits:
-    cpu: 500m
-    memory: 1Gi
-
-postgresql:
-  enabled: true
-  image:
-    repository: bitnamilegacy/postgresql
-  auth:
-    existingSecret: keycloak-credentials
-    secretKeys:
-      adminPasswordKey: postgres-password
-      userPasswordKey: password
-    username: bn_keycloak
-    database: bitnami_keycloak
-  primary:
-    persistence:
-      size: 8Gi
-
-keycloakConfigCli:
-  enabled: true
-  image:
-    repository: bitnamilegacy/keycloak-config-cli
-  configuration:
-    forte-realm.json: |
-      {
-        "realm": "forte",
-        "enabled": true,
-        "displayName": "Forte",
-        "sslRequired": "external",
-        "registrationAllowed": false,
-        "loginWithEmailAllowed": true,
-        "resetPasswordAllowed": true,
-        "rememberMe": true,
-        "clients": [
-          {
-            "clientId": "gitea",
-            "name": "Gitea",
-            "enabled": true,
-            "protocol": "openid-connect",
-            "clientAuthenticatorType": "client-secret",
-            "standardFlowEnabled": true,
-            "directAccessGrantsEnabled": false,
-            "publicClient": false,
-            "redirectUris": ["https://git.forteapps.net/*"],
-            "webOrigins": ["https://git.forteapps.net"],
-            "attributes": {
-              "k8s.secret.sync": "true",
-              "k8s.secret.namespace": "gitea",
-              "k8s.secret.name": "gitea-oidc-credentials",
-              "k8s.secret.client-id-key": "key",
-              "k8s.secret.client-secret-key": "secret"
-            },
-            "protocolMappers": [
-              {
-                "name": "email_verified",
-                "protocol": "openid-connect",
-                "protocolMapper": "oidc-hardcoded-claim-mapper",
-                "config": {
-                  "claim.name": "email_verified",
-                  "claim.value": "true",
-                  "jsonType.label": "boolean",
-                  "id.token.claim": "true",
-                  "access.token.claim": "true",
-                  "userinfo.token.claim": "true"
-                }
-              }
-            ]
-          },
-          {
-            "clientId": "grafana",
-            "name": "Grafana",
-            "enabled": true,
-            "protocol": "openid-connect",
-            "clientAuthenticatorType": "client-secret",
-            "standardFlowEnabled": true,
-            "directAccessGrantsEnabled": false,
-            "publicClient": false,
-            "redirectUris": ["https://grafana.forteapps.net/*"],
-            "webOrigins": ["https://grafana.forteapps.net"],
-            "attributes": {
-              "k8s.secret.sync": "true",
-              "k8s.secret.namespace": "monitoring",
-              "k8s.secret.name": "grafana-oidc-credentials",
-              "k8s.secret.client-id-key": "client-id",
-              "k8s.secret.client-secret-key": "client-secret"
-            },
-            "protocolMappers": [
-              {
-                "name": "client-roles",
-                "protocol": "openid-connect",
-                "protocolMapper": "oidc-usermodel-client-role-mapper",
-                "config": {
-                  "claim.name": "resource_access.grafana.roles",
-                  "jsonType.label": "String",
-                  "multivalued": "true",
-                  "usermodel.clientRoleMapping.clientId": "grafana",
-                  "id.token.claim": "true",
-                  "access.token.claim": "true",
-                  "userinfo.token.claim": "true"
-                }
-              }
-            ]
-          },
-          {
-            "clientId": "argocd",
-            "name": "ArgoCD",
-            "enabled": true,
-            "protocol": "openid-connect",
-            "clientAuthenticatorType": "client-secret",
-            "standardFlowEnabled": true,
-            "directAccessGrantsEnabled": false,
-            "publicClient": false,
-            "redirectUris": ["https://argocd.forteapps.net/auth/callback"],
-            "webOrigins": ["https://argocd.forteapps.net"],
-            "attributes": {
-              "k8s.secret.sync": "true",
-              "k8s.secret.namespace": "argocd",
-              "k8s.secret.name": "argocd-oidc-credentials",
-              "k8s.secret.client-id-key": "client-id",
-              "k8s.secret.client-secret-key": "client-secret"
-            },
-            "protocolMappers": [
-              {
-                "name": "groups",
-                "protocol": "openid-connect",
-                "protocolMapper": "oidc-group-membership-mapper",
-                "config": {
-                  "claim.name": "groups",
-                  "full.path": "false",
-                  "id.token.claim": "true",
-                  "access.token.claim": "true",
-                  "userinfo.token.claim": "true"
-                }
-              }
-            ]
-          }
-        ],
-        "groups": [
-          {
-            "name": "ArgoCD Admins",
-            "path": "/ArgoCD Admins"
-          },
-          {
-            "name": "ArgoCD Viewers",
-            "path": "/ArgoCD Viewers"
-          },
-          {
-            "name": "Observability Team",
-            "path": "/Observability Team"
-          },
-          {
-            "name": "Dev Tools Team",
-            "path": "/Dev Tools Team"
-          },
-          {
-            "name": "App Developers",
-            "path": "/App Developers"
-          }
-        ]
-      }
-
-extraDeploy:
-# -- ServiceAccount for the client registrar CronJob
- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: keycloak-client-registrar
-    namespace: keycloak
-
-# -- ClusterRole granting access to secrets and namespaces
- apiVersion: rbac.authorization.k8s.io/v1
-  kind: ClusterRole
-  metadata:
-    name: keycloak-client-registrar
-  rules:
-  - apiGroups: [ "" ]
-    resources: [ "secrets" ]
-    verbs: [ "get", "list", "create", "update", "patch" ]
-  - apiGroups: [ "" ]
-    resources: [ "namespaces" ]
-    verbs: [ "get", "list" ]
-
-# -- ClusterRoleBinding for the registrar ServiceAccount
- apiVersion: rbac.authorization.k8s.io/v1
-  kind: ClusterRoleBinding
-  metadata:
-    name: keycloak-client-registrar
-  roleRef:
-    apiGroup: rbac.authorization.k8s.io
-    kind: ClusterRole
-    name: keycloak-client-registrar
-  subjects:
-  - kind: ServiceAccount
-    name: keycloak-client-registrar
-    namespace: keycloak
-
-# -- CronJob: registers Keycloak clients and syncs secrets
- apiVersion: batch/v1
-  kind: CronJob
-  metadata:
-    name: keycloak-client-registrar
-    namespace: keycloak
-  spec:
-    schedule: "*/2 * * * *"
-    concurrencyPolicy: Forbid
-    successfulJobsHistoryLimit: 1
-    failedJobsHistoryLimit: 3
-    jobTemplate:
-      spec:
-        backoffLimit: 3
-        template:
-          spec:
-            serviceAccountName: keycloak-client-registrar
-            restartPolicy: Never
-            containers:
-            - name: registrar
-              image: alpine:3.20
-              command: [ "/bin/sh", "-c" ]
-              args:
-              - |
-                set -e
-                apk add --no-cache curl jq > /dev/null 2>&1
-
-                KEYCLOAK_URL="http://keycloak:80"
-                REALM="forte"
-                K8S_API="https://kubernetes.default.svc"
-                SA_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-                CA_CERT="/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-                CENTRAL_NS="secrets"
-
-                # --- Authenticate to Keycloak Admin API ---
-                ADMIN_USER="admin"
-                ADMIN_PASS=$(cat /secrets/admin-password)
-
-                echo "Authenticating to Keycloak..."
-                TOKEN=$(curl -sf -X POST "${KEYCLOAK_URL}/realms/master/protocol/openid-connect/token" \
-                  -d "client_id=admin-cli" \
-                  -d "username=${ADMIN_USER}" \
-                  -d "password=${ADMIN_PASS}" \
-                  -d "grant_type=password" | jq -r '.access_token')
-
-                if [ -z "$TOKEN" ] || [ "$TOKEN" = "null" ]; then
-                  echo "ERROR: Failed to authenticate to Keycloak"
-                  exit 1
-                fi
-
-                # --- Helper functions ---
-
-                # Upsert a K8s Secret: try PUT (update), fall back to POST (create)
-                upsert_secret() {
-                  local ns="$1" name="$2" manifest="$3"
-                  local code
-                  code=$(curl -sf -o /dev/null -w "%{http_code}" \
-                    --cacert "$CA_CERT" \
-                    -H "Authorization: Bearer ${SA_TOKEN}" \
-                    -H "Content-Type: application/json" \
-                    -X PUT -d "$manifest" \
-                    "${K8S_API}/api/v1/namespaces/${ns}/secrets/${name}")
-                  if [ "$code" = "200" ]; then
-                    echo "  Updated secret '${ns}/${name}'"
-                  elif [ "$code" = "404" ]; then
-                    code=$(curl -sf -o /dev/null -w "%{http_code}" \
-                      --cacert "$CA_CERT" \
-                      -H "Authorization: Bearer ${SA_TOKEN}" \
-                      -H "Content-Type: application/json" \
-                      -X POST -d "$manifest" \
-                      "${K8S_API}/api/v1/namespaces/${ns}/secrets")
-                    if [ "$code" = "201" ]; then
-                      echo "  Created secret '${ns}/${name}'"
-                    else
-                      echo "  ERROR: Failed to create secret '${ns}/${name}' (HTTP ${code})"
-                      return 1
-                    fi
-                  else
-                    echo "  ERROR: Failed to update secret '${ns}/${name}' (HTTP ${code})"
-                    return 1
-                  fi
-                }
-
-                # Build a credential Secret JSON manifest
-                build_credential_secret() {
-                  local ns="$1" name="$2" id_key="$3" secret_key="$4" b64_id="$5" b64_secret="$6"
-                  cat <<MANIFEST
-                {
-                  "apiVersion": "v1",
-                  "kind": "Secret",
-                  "metadata": {
-                    "name": "${name}",
-                    "namespace": "${ns}",
-                    "labels": {
-                      "app.kubernetes.io/managed-by": "keycloak-client-registrar"
-                    }
-                  },
-                  "type": "Opaque",
-                  "data": {
-                    "${id_key}": "${b64_id}",
-                    "${secret_key}": "${b64_secret}"
-                  }
-                }
-                MANIFEST
-                }
-
-                # Sync credentials to target + central namespace
-                sync_credentials() {
-                  local client_id="$1" client_uuid="$2" target_ns="$3" target_name="$4" id_key="$5" secret_key="$6"
-
-                  # Get the client secret from Keycloak
-                  local secret_value
-                  secret_value=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
-                    "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${client_uuid}/client-secret" \
-                    | jq -r '.value')
-
-                  if [ -z "$secret_value" ] || [ "$secret_value" = "null" ]; then
-                    echo "  WARNING: No secret found for client '${client_id}', skipping"
-                    return 0
-                  fi
-
-                  local b64_id b64_secret
-                  b64_id=$(printf '%s' "$client_id" | base64 | tr -d '\n')
-                  b64_secret=$(printf '%s' "$secret_value" | base64 | tr -d '\n')
-
-                  # Write to target namespace (if it exists)
-                  local ns_status
-                  ns_status=$(curl -sf -o /dev/null -w "%{http_code}" \
-                    --cacert "$CA_CERT" \
-                    -H "Authorization: Bearer ${SA_TOKEN}" \
-                    "${K8S_API}/api/v1/namespaces/${target_ns}")
-
-                  if [ "$ns_status" = "200" ]; then
-                    local manifest
-                    manifest=$(build_credential_secret "$target_ns" "$target_name" "$id_key" "$secret_key" "$b64_id" "$b64_secret")
-                    upsert_secret "$target_ns" "$target_name" "$manifest" || return 1
-                  else
-                    echo "  WARNING: Namespace '${target_ns}' does not exist, skipping target"
-                  fi
-
-                  # Always write a central copy to the secrets namespace
-                  local central_manifest
-                  central_manifest=$(build_credential_secret "$CENTRAL_NS" "$target_name" "$id_key" "$secret_key" "$b64_id" "$b64_secret")
-                  upsert_secret "$CENTRAL_NS" "$target_name" "$central_manifest" || return 1
-                }
-
-                # Annotate a K8s Secret with sync status
-                annotate_secret() {
-                  local ns="$1" name="$2" key="$3" value="$4"
-                  local patch
-                  patch=$(printf '{"metadata":{"annotations":{"%s":"%s"}}}' "$key" "$value")
-                  curl -sf -o /dev/null \
-                    --cacert "$CA_CERT" \
-                    -H "Authorization: Bearer ${SA_TOKEN}" \
-                    -H "Content-Type: application/strategic-merge-patch+json" \
-                    -X PATCH -d "$patch" \
-                    "${K8S_API}/api/v1/namespaces/${ns}/secrets/${name}"
-                }
-
-                # =============================================
-                # LEGACY PATH — sync existing realm clients
-                # =============================================
-                echo "=== Legacy sync: clients with k8s.secret.sync=true ==="
-
-                CLIENTS=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
-                  "${KEYCLOAK_URL}/admin/realms/${REALM}/clients")
-
-                SYNC_CLIENTS=$(echo "$CLIENTS" | jq -c '[.[] | select(.attributes["k8s.secret.sync"] == "true")]')
-                COUNT=$(echo "$SYNC_CLIENTS" | jq 'length')
-                echo "Found ${COUNT} legacy client(s) with sync enabled"
-
-                echo "$SYNC_CLIENTS" | jq -c '.[]' | while read -r CLIENT; do
-                  CLIENT_ID=$(echo "$CLIENT" | jq -r '.clientId')
-                  CLIENT_UUID=$(echo "$CLIENT" | jq -r '.id')
-                  TARGET_NS=$(echo "$CLIENT" | jq -r '.attributes["k8s.secret.namespace"]')
-                  TARGET_NAME=$(echo "$CLIENT" | jq -r '.attributes["k8s.secret.name"]')
-                  ID_KEY=$(echo "$CLIENT" | jq -r '.attributes["k8s.secret.client-id-key"] // "client-id"')
-                  SECRET_KEY=$(echo "$CLIENT" | jq -r '.attributes["k8s.secret.client-secret-key"] // "client-secret"')
-
-                  echo "Processing legacy client '${CLIENT_ID}' -> '${TARGET_NS}/${TARGET_NAME}' (keys: ${ID_KEY}, ${SECRET_KEY})"
-                  sync_credentials "$CLIENT_ID" "$CLIENT_UUID" "$TARGET_NS" "$TARGET_NAME" "$ID_KEY" "$SECRET_KEY"
-                done
-
-                # =============================================
-                # NEW PATH — self-service config Secrets
-                # =============================================
-                echo ""
-                echo "=== Self-service: config Secrets with label keycloak.forteapps.net/client-config=true ==="
-
-                CONFIG_SECRETS=$(curl -sf \
-                  --cacert "$CA_CERT" \
-                  -H "Authorization: Bearer ${SA_TOKEN}" \
-                  "${K8S_API}/api/v1/namespaces/keycloak/secrets?labelSelector=keycloak.forteapps.net/client-config=true")
-
-                CONFIG_COUNT=$(echo "$CONFIG_SECRETS" | jq '.items | length')
-                echo "Found ${CONFIG_COUNT} config Secret(s) to process"
-
-                echo "$CONFIG_SECRETS" | jq -c '.items[]' | while read -r CONFIG_SECRET; do
-                  CONFIG_NAME=$(echo "$CONFIG_SECRET" | jq -r '.metadata.name')
-                  SOURCE_NS=$(echo "$CONFIG_SECRET" | jq -r '.metadata.annotations["keycloak.forteapps.net/source-namespace"] // .metadata.labels["keycloak.forteapps.net/source-namespace"] // "unknown"')
-
-                  # Decode client.json from the Secret data
-                  CLIENT_JSON_B64=$(echo "$CONFIG_SECRET" | jq -r '.data["client.json"] // empty')
-                  if [ -z "$CLIENT_JSON_B64" ]; then
-                    echo "WARNING: Config Secret '${CONFIG_NAME}' missing client.json field, skipping"
-                    continue
-                  fi
-                  CLIENT_JSON=$(printf '%s' "$CLIENT_JSON_B64" | base64 -d)
-
-                  CLIENT_ID=$(echo "$CLIENT_JSON" | jq -r '.clientId')
-                  echo "Processing self-service client '${CLIENT_ID}' from config '${CONFIG_NAME}'"
-
-                  # Compute config hash for change detection
-                  CONFIG_HASH=$(printf '%s' "$CLIENT_JSON" | sha256sum | cut -d' ' -f1)
-                  EXISTING_HASH=$(echo "$CONFIG_SECRET" | jq -r '.metadata.annotations["keycloak.forteapps.net/config-hash"] // ""')
-
-                  # Extract secret delivery config from client.json
-                  CRED_NS=$(echo "$CLIENT_JSON" | jq -r '.secret.namespace // "'"${SOURCE_NS}"'"')
-                  CRED_NAME=$(echo "$CLIENT_JSON" | jq -r '.secret.name // "'"${CLIENT_ID}"'-oidc-credentials"')
-                  CRED_ID_KEY=$(echo "$CLIENT_JSON" | jq -r '.secret.keys.clientId // "client-id"')
-                  CRED_SECRET_KEY=$(echo "$CLIENT_JSON" | jq -r '.secret.keys.clientSecret // "client-secret"')
-
-                  # Check if credential Secret already exists in target namespace
-                  CRED_EXISTS=$(curl -sf -o /dev/null -w "%{http_code}" \
-                    --cacert "$CA_CERT" \
-                    -H "Authorization: Bearer ${SA_TOKEN}" \
-                    "${K8S_API}/api/v1/namespaces/${CRED_NS}/secrets/${CRED_NAME}")
-
-                  # Skip if hash matches and credential Secret exists
-                  if [ "$CONFIG_HASH" = "$EXISTING_HASH" ] && [ "$CRED_EXISTS" = "200" ]; then
-                    echo "  No changes detected, skipping"
-                    continue
-                  fi
-
-                  # Build Keycloak client representation (strip our secret delivery config)
-                  KC_CLIENT=$(echo "$CLIENT_JSON" | jq '{
-                    clientId: .clientId,
-                    name: .name,
-                    enabled: true,
-                    protocol: "openid-connect",
-                    clientAuthenticatorType: "client-secret",
-                    standardFlowEnabled: true,
-                    directAccessGrantsEnabled: false,
-                    publicClient: false,
-                    redirectUris: .redirectUris,
-                    webOrigins: .webOrigins,
-                    defaultClientScopes: .defaultClientScopes,
-                    protocolMappers: (.protocolMappers // [])
-                  }')
-
-                  # Check if client already exists
-                  EXISTING=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
-                    "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" \
-                    | jq -r '.[0].id // empty')
-
-                  if [ -n "$EXISTING" ]; then
-                    echo "  Updating existing Keycloak client (uuid: ${EXISTING})"
-                    HTTP_CODE=$(curl -sf -o /dev/null -w "%{http_code}" \
-                      -H "Authorization: Bearer ${TOKEN}" \
-                      -H "Content-Type: application/json" \
-                      -X PUT -d "$KC_CLIENT" \
-                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${EXISTING}")
-                    if [ "$HTTP_CODE" != "204" ] && [ "$HTTP_CODE" != "200" ]; then
-                      echo "  ERROR: Failed to update client '${CLIENT_ID}' (HTTP ${HTTP_CODE})"
-                      annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/sync-status" "error"
-                      continue
-                    fi
-                    CLIENT_UUID="$EXISTING"
-                  else
-                    echo "  Creating new Keycloak client '${CLIENT_ID}'"
-                    HTTP_CODE=$(curl -sf -o /dev/null -w "%{http_code}" \
-                      -H "Authorization: Bearer ${TOKEN}" \
-                      -H "Content-Type: application/json" \
-                      -X POST -d "$KC_CLIENT" \
-                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients")
-                    if [ "$HTTP_CODE" != "201" ]; then
-                      echo "  ERROR: Failed to create client '${CLIENT_ID}' (HTTP ${HTTP_CODE})"
-                      annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/sync-status" "error"
-                      continue
-                    fi
-                    # Fetch the newly created client's UUID
-                    CLIENT_UUID=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
-                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" \
-                      | jq -r '.[0].id')
-                  fi
-
-                  # Sync credentials to target namespace
-                  sync_credentials "$CLIENT_ID" "$CLIENT_UUID" "$CRED_NS" "$CRED_NAME" "$CRED_ID_KEY" "$CRED_SECRET_KEY"
-
-                  # Annotate config Secret with hash and sync status
-                  annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/config-hash" "$CONFIG_HASH"
-                  annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/sync-status" "synced"
-                  TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-                  annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/last-sync" "$TIMESTAMP"
-                  echo "  Synced successfully"
-                done
-
-                echo ""
-                echo "Client registrar run complete"
-              volumeMounts:
-              - name: keycloak-credentials
-                mountPath: /secrets
-                readOnly: true
-              resources:
-                requests:
-                  cpu: 50m
-                  memory: 64Mi
-                limits:
-                  cpu: 200m
-                  memory: 128Mi
-            volumes:
-            - name: keycloak-credentials
-              secret:
-                secretName: keycloak-credentials
-                items:
-                - key: admin-password
-                  path: admin-password
--- a/infra/values/base/renovate-values.yaml
+++ b/infra/values/base/renovate-values.yaml
@@ -1,45 +0,0 @@
-cronjob:
-  schedule: "@daily"
-  concurrencyPolicy: Forbid
-
-renovate:
-  config: |
-    {
-      "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-      "platform": "gitea",
-      "endpoint": "https://git.forteapps.net",
-      "autodiscover": true,
-      "gitAuthor": "Renovate Bot <renovate@forteapps.net>",
-      "packageRules": [
-        {
-          "matchRepositories": ["**/10x"],
-          "assignees": ["edvard.unsvag"],
-          "reviewers": ["edvard.unsvag"]
-        },
-        {
-          "matchRepositories": ["**/auth-sidecar"],
-          "assignees": ["danijel.simeunovic"],
-          "reviewers": ["danijel.simeunovic"]
-        },
-        {
-          "matchRepositories": ["**/forte-helm"],
-          "assignees": ["danijel.simeunovic"],
-          "reviewers": ["danijel.simeunovic"]
-        }
-      ]
-    }
-
-envFrom:
- secretRef:
-    name: renovate-env
-
-env:
-  LOG_LEVEL: info
-
-resources:
-  requests:
-    cpu: 500m
-    memory: 1Gi
-  limits:
-    cpu: "2"
-    memory: 4Gi
--- a/infra/values/base/traefik-values.yaml
+++ b/infra/values/base/traefik-values.yaml
@@ -1,75 +0,0 @@
-providers:
-  kubernetesIngress:
-    publishedService: # Fixes ArgoCD health checks for LoadBalancer services
-      enabled: true
-  kubernetesCRD:
-    allowCrossNamespace: true
-deployment:
-  replicas: 2
-
-ingressRoute:
-  dashboard:
-    enabled: true
-    # Optional: specify entrypoint
-    entrypoint: traefik
-
-api:
-  dashboard: true
-  debug: false
-
-service:
-  type: LoadBalancer
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.priority: "42"
-    traefik.ingress.kubernetes.io/router.tls: "true"
-
-ingressClass:
-  enabled: true
-  isDefaultClass: true
-
-# Configure entry points
-ports:
-  metrics:
-    expose:
-      default: true
-    observability:
-      accessLogs: true
-      metrics: true
-      tracing: true
-      traceVerbosity: detailed
-  web:
-    http:
-      redirections:
-        entrypoint:
-          to: websecure
-          scheme: https
-
-  websecure:
-    observability:
-      accessLogs: true
-      metrics: true
-      tracing: true
-
-  gitea-ssh:
-    port: 2222
-    expose:
-      default: true
-    exposedPort: 2222
-    protocol: TCP
-
-# -- IngressRouteTCP for Gitea SSH (cross-namespace to gitea/gitea-ssh service)
-extraObjects:
- apiVersion: traefik.io/v1alpha1
-  kind: IngressRouteTCP
-  metadata:
-    name: gitea-ssh
-  spec:
-    entryPoints:
-    - gitea-ssh
-    routes:
-    - match: HostSNI(`*`)
-      services:
-      - name: gitea-ssh
-        namespace: gitea
-        port: 22
--- a/infra/values/eks-dev/gitea-values.yaml
+++ b/infra/values/eks-dev/gitea-values.yaml
@@ -1,7 +0,0 @@
-# EKS-specific: gp3 storage class
-persistence:
-  storageClass: gp3
-postgresql:
-  primary:
-    persistence:
-      storageClass: gp3
--- a/infra/values/eks-dev/grafana-values.yaml
+++ b/infra/values/eks-dev/grafana-values.yaml
@@ -1,4 +0,0 @@
-# EKS-specific: Grafana hostname
-ingress:
-  hosts:
-  - grafana.forteapps.net
--- a/infra/values/eks-dev/keycloak-values.yaml
+++ b/infra/values/eks-dev/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# EKS-specific: Keycloak hostname
-ingress:
-  hostname: id.forteapps.net
--- a/infra/values/eks-dev/opencost-values.yaml
+++ b/infra/values/eks-dev/opencost-values.yaml
@@ -1,11 +0,0 @@
-# EKS-specific: AWS pricing via Cost and Usage Report
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    aws:
-      spot_data_region: ""
-      spot_data_bucket: ""
-      spot_data_prefix: ""
-      account_id: ""
--- a/infra/values/eks-dev/traefik-values.yaml
+++ b/infra/values/eks-dev/traefik-values.yaml
@@ -1,17 +0,0 @@
-# EKS-specific: AWS NLB for Traefik
-service:
-  annotations:
-    service.beta.kubernetes.io/aws-load-balancer-type: nlb
-    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
-    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-ports:
-  web:
-    proxyProtocol:
-      trustedIPs: "10.0.0.0/8"
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    proxyProtocol:
-      trustedIPs: "10.0.0.0/8"
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/eks-prod/gitea-values.yaml
+++ b/infra/values/eks-prod/gitea-values.yaml
@@ -1,7 +0,0 @@
-# EKS-specific: gp3 storage class (prod)
-persistence:
-  storageClass: gp3
-postgresql:
-  primary:
-    persistence:
-      storageClass: gp3
--- a/Show More
+++ b/Show More