diff --git a/k8s/argocd/apps/00-strimzi-operator.yaml b/k8s/argocd/apps/00-strimzi-operator.yaml
index 48d92d5..6f4a311 100644
--- a/k8s/argocd/apps/00-strimzi-operator.yaml
+++ b/k8s/argocd/apps/00-strimzi-operator.yaml
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: strimzi-operator
-  namespace: cicd
+  namespace: sqs
   annotations:
     argocd.argoproj.io/sync-wave: "0"
 spec:
diff --git a/k8s/argocd/apps/01-kafka-cluster.yaml b/k8s/argocd/apps/01-kafka-cluster.yaml
index a27d542..ab5f3b9 100644
--- a/k8s/argocd/apps/01-kafka-cluster.yaml
+++ b/k8s/argocd/apps/01-kafka-cluster.yaml
@@ -2,14 +2,14 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: kafka-cluster
-  namespace: cicd
+  namespace: sqs
   annotations:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   project: kmsvc
   source:
-    repoURL: https://forgejo.riotpiao.homelab.com/rock/kafaka-management-service.git
-    targetRevision: main
+    repoURL: https://forgejo.riotpiao.com/rock/kmsvc-manage.git
+    targetRevision: prod
     path: k8s/charts/kafka-cluster
     helm:
       values: |
diff --git a/k8s/argocd/apps/02-redis.yaml b/k8s/argocd/apps/02-redis.yaml
index e1076a3..c9c5221 100644
--- a/k8s/argocd/apps/02-redis.yaml
+++ b/k8s/argocd/apps/02-redis.yaml
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: kmsvc-redis
-  namespace: cicd
+  namespace: sqs
   annotations:
     argocd.argoproj.io/sync-wave: "1"
 spec:
diff --git a/k8s/argocd/apps/03-queue-crd.yaml b/k8s/argocd/apps/03-queue-crd.yaml
index 495d309..1dfd34f 100644
--- a/k8s/argocd/apps/03-queue-crd.yaml
+++ b/k8s/argocd/apps/03-queue-crd.yaml
@@ -2,14 +2,14 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: queue-crd
-  namespace: cicd
+  namespace: sqs
   annotations:
     argocd.argoproj.io/sync-wave: "2"
 spec:
   project: kmsvc
   source:
-    repoURL: https://forgejo.riotpiao.homelab.com/rock/kafaka-management-service.git
-    targetRevision: main
+    repoURL: https://forgejo.riotpiao.com/rock/kmsvc-manage.git
+    targetRevision: prod
     path: k8s/charts/queue-crd
     helm:
       values: |
diff --git a/k8s/argocd/apps/04-management-service.yaml b/k8s/argocd/apps/04-management-service.yaml
index 459c8ee..0341b04 100644
--- a/k8s/argocd/apps/04-management-service.yaml
+++ b/k8s/argocd/apps/04-management-service.yaml
@@ -2,31 +2,31 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: management-service
-  namespace: cicd
+  namespace: sqs
   annotations:
     argocd.argoproj.io/sync-wave: "2"
 spec:
   project: kmsvc
   source:
-    repoURL: https://forgejo.riotpiao.homelab.com/rock/kafaka-management-service.git
-    targetRevision: main
+    repoURL: https://forgejo.riotpiao.com/rock/kmsvc-manage.git
+    targetRevision: prod
     path: k8s/charts/management-service
     helm:
       values: |
         namespace: sqs
         image:
-          repository: forgejo.riotpiao.homelab.com/rock/kafka-management-service
-          # CI (.forgejo/workflows/release.yaml) writes the released git tag
-          # here and pushes the commit -- ArgoCD picks it up on its next sync.
+          repository: forgejo.riotpiao.com/rock/kmsvc-manage
+          # On prod branch: built on each commit push via CI workflow
+          # Tag is set to the git commit SHA for reproducible deployments
           tag: latest
         env:
           kafkaBrokers: "kmsvc-kafka-bootstrap.sqs.svc.cluster.local:9092"
           redisAddr: "kmsvc-redis-master.sqs.svc.cluster.local:6379"
-          authentikIssuerURL: "https://authentik.riotpiao.homelab.com/application/o/kafaka/"
-          authentikAudience: "QI0gPtR99ar8VvhK8Tqox4SDkTKzbNU7lbgwBNSc"
+          authentikIssuerURL: ""
+          authentikAudience: ""
         ingress:
           enabled: true
-          host: kmsvc.riotpiao.homelab.com
+          host: kmsvc.riotpiao.com
           clusterIssuer: homelab-ca
   destination:
     server: https://kubernetes.default.svc
diff --git a/k8s/argocd/root.yaml b/k8s/argocd/root.yaml
index 923314a..cad6b20 100644
--- a/k8s/argocd/root.yaml
+++ b/k8s/argocd/root.yaml
@@ -7,13 +7,13 @@ spec:
   project: kmsvc
   source:
     repoURL: https://forgejo.riotpiao.com/rock/kmsvc-manage.git
-    targetRevision: main
+    targetRevision: prod
     path: k8s/argocd/apps
     directory:
       recurse: false
   destination:
     server: https://kubernetes.default.svc
-    namespace: cicd
+    namespace: sqs
   syncPolicy:
     automated:
       prune: true
diff --git a/k8s/charts/management-service/values.yaml b/k8s/charts/management-service/values.yaml
index e9937eb..1d1d1a3 100644
--- a/k8s/charts/management-service/values.yaml
+++ b/k8s/charts/management-service/values.yaml
@@ -2,7 +2,7 @@ namespace: sqs
 replicaCount: 2
 
 image:
-  repository: forgejo.riotpiao.homelab.com/rock/kafka-management-service
+  repository: forgejo.riotpiao.com/rock/kmsvc-manage
   tag: latest
   pullPolicy: Always