diff --git a/k8s/argocd/apps/50-messaging.yaml b/k8s/argocd/apps/50-messaging.yaml
index 3ada789..51964ed 100644
--- a/k8s/argocd/apps/50-messaging.yaml
+++ b/k8s/argocd/apps/50-messaging.yaml
@@ -1,6 +1,6 @@
-# Wave 5 — Kafka (Strimzi operator + cluster CR), Redis, and the SQS-like
-# queue services. Strimzi/Redis are public Helm charts; kafka-cluster/queue-crd/
-# management-service are local charts (rendered from their own Chart.yaml).
+# Wave 5 — Kafka (Strimzi operator + cluster CR), Redis infrastructure.
+# Strimzi/Redis are public Helm charts; kafka-cluster is a local chart.
+# queue-crd and management-service are managed by kmsvc-root (kmsvc-manage.git).
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -78,55 +78,5 @@ spec:
     automated:
       prune: true
       selfHeal: true
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: queue-crd
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "6"
-    # ArgoCD Image Updater - auto-update on new image push
-    argocd-image-updater.argoproj.io/image-list: op=forgejo.riotpiao.com/rock/kmsvc-manage
-    argocd-image-updater.argoproj.io/op.update-strategy: newest-build
-    argocd-image-updater.argoproj.io/op.allow-tags: regexp:^[0-9a-f]{7}$
-    argocd-image-updater.argoproj.io/write-back-method: argocd
-spec:
-  project: homelab
-  source:
-    repoURL: https://forgejo.riotpiao.com/rock/homelab.git
-    targetRevision: main
-    path: k8s/apps/messaging/queue-crd
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: sqs
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: management-service
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "7"
-    # ArgoCD Image Updater - auto-update on new image push
-    argocd-image-updater.argoproj.io/image-list: svc=forgejo.riotpiao.com/rock/kmsvc-manage
-    argocd-image-updater.argoproj.io/svc.update-strategy: newest-build
-    argocd-image-updater.argoproj.io/svc.allow-tags: regexp:^[0-9a-f]{7}$
-    argocd-image-updater.argoproj.io/write-back-method: argocd
-spec:
-  project: homelab
-  source:
-    repoURL: https://forgejo.riotpiao.com/rock/homelab.git
-    targetRevision: main
-    path: k8s/apps/messaging/management-service
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: sqs
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
+# queue-crd and management-service moved to kmsvc-manage.git repo
+# Managed by kmsvc-root Application
diff --git a/k8s/argocd/root/homelab-root.yaml b/k8s/argocd/root/homelab-root.yaml
index b642887..98ca280 100644
--- a/k8s/argocd/root/homelab-root.yaml
+++ b/k8s/argocd/root/homelab-root.yaml
@@ -26,3 +26,4 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true