diff --git a/argocd/applications/configs/namespace-label.yaml b/argocd/applications/configs/namespace-label.yaml
deleted file mode 100644
index 6fba4afe1..000000000
--- a/argocd/applications/configs/namespace-label.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-namespaces:
-  - name: "orch-infra"
-    labels:
-      istio-injection: enabled
-  - name: "orch-iam"
-    labels:
-      istio-injection: enabled
-  - name: "orch-app"
-    labels:
-      istio-injection: enabled
-  - name: "orch-cluster"
-    labels:
-      istio-injection: enabled
-  - name: "orch-ui"
-    labels:
-      istio-injection: enabled
-  - name: "orch-platform"
-    labels:
-      istio-injection: enabled
-  - name: "orch-harbor"
-    labels:
-      istio-injection: enabled
-  - name: "orch-gateway"
-    labels:
-      istio-injection: enabled
-  - name: "orch-sre"
-    labels:
-      istio-injection: enabled
-  - name: "orch-database"
-    labels:
-      istio-injection: enabled
-  - name: orch-boots
-    labels:
-      istio-injection: enabled
-  - name: orch-secret
-    labels:
-      istio-injection: enabled
-  - name: "fleet-default"
-    labels:
-      app.edge-orchestrator.intel.com/fleet-rs-secret: "true"
-  - name: "capi-variables"
-resources: null
diff --git a/argocd/applications/configs/wait-istio-job.yaml b/argocd/applications/configs/wait-istio-job.yaml
deleted file mode 100644
index 3b3be66a4..000000000
--- a/argocd/applications/configs/wait-istio-job.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-jobPrefix: "namespace-label"
diff --git a/argocd/applications/templates/alerting-monitor.yaml b/argocd/applications/templates/alerting-monitor.yaml
index 94654d341..a6ce728be 100644
--- a/argocd/applications/templates/alerting-monitor.yaml
+++ b/argocd/applications/templates/alerting-monitor.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-deployment-crd.yaml b/argocd/applications/templates/app-deployment-crd.yaml
index 2eab6334f..ae2e59418 100644
--- a/argocd/applications/templates/app-deployment-crd.yaml
+++ b/argocd/applications/templates/app-deployment-crd.yaml
@@ -4,7 +4,7 @@
 
 {{- $appName        := "app-deployment-crd" }}
 {{- $namespace      := "orch-app" }}
-{{- $syncWave       := "2000" }}
+{{- $syncWave       := "150" }}
 ---
 {{- if (index .Values.argo.enabled $appName) }}
 apiVersion: argoproj.io/v1alpha1
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-deployment-manager-secret.yaml b/argocd/applications/templates/app-deployment-manager-secret.yaml
index 517881b64..ba4d1810a 100644
--- a/argocd/applications/templates/app-deployment-manager-secret.yaml
+++ b/argocd/applications/templates/app-deployment-manager-secret.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-deployment-manager.yaml b/argocd/applications/templates/app-deployment-manager.yaml
index 04b68554c..48c69f33a 100644
--- a/argocd/applications/templates/app-deployment-manager.yaml
+++ b/argocd/applications/templates/app-deployment-manager.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-interconnect-manager.yaml b/argocd/applications/templates/app-interconnect-manager.yaml
index 7289b6374..77a7c8ab5 100644
--- a/argocd/applications/templates/app-interconnect-manager.yaml
+++ b/argocd/applications/templates/app-interconnect-manager.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-orch-catalog.yaml b/argocd/applications/templates/app-orch-catalog.yaml
index beca7a229..a69596739 100644
--- a/argocd/applications/templates/app-orch-catalog.yaml
+++ b/argocd/applications/templates/app-orch-catalog.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-orch-tenant-controller.yaml b/argocd/applications/templates/app-orch-tenant-controller.yaml
index 6969021de..173354bb8 100644
--- a/argocd/applications/templates/app-orch-tenant-controller.yaml
+++ b/argocd/applications/templates/app-orch-tenant-controller.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-resource-manager.yaml b/argocd/applications/templates/app-resource-manager.yaml
index eda5c86db..a3dec9e02 100644
--- a/argocd/applications/templates/app-resource-manager.yaml
+++ b/argocd/applications/templates/app-resource-manager.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/app-service-proxy.yaml b/argocd/applications/templates/app-service-proxy.yaml
index 14e0fcda4..cc1d16080 100644
--- a/argocd/applications/templates/app-service-proxy.yaml
+++ b/argocd/applications/templates/app-service-proxy.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/auth-service.yaml b/argocd/applications/templates/auth-service.yaml
index 49450a1dc..7ac7838bc 100644
--- a/argocd/applications/templates/auth-service.yaml
+++ b/argocd/applications/templates/auth-service.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/aws-lb-tgb.yaml b/argocd/applications/templates/aws-lb-tgb.yaml
index a742dc326..92354d64b 100644
--- a/argocd/applications/templates/aws-lb-tgb.yaml
+++ b/argocd/applications/templates/aws-lb-tgb.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/aws-lb.yaml b/argocd/applications/templates/aws-lb.yaml
index 6823d6acf..2131bb572 100644
--- a/argocd/applications/templates/aws-lb.yaml
+++ b/argocd/applications/templates/aws-lb.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/aws-sm-get-rs-token.yaml b/argocd/applications/templates/aws-sm-get-rs-token.yaml
index d39de5796..0cdab049b 100644
--- a/argocd/applications/templates/aws-sm-get-rs-token.yaml
+++ b/argocd/applications/templates/aws-sm-get-rs-token.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/aws-sm-proxy.yaml b/argocd/applications/templates/aws-sm-proxy.yaml
index 555a7f8a6..5f5da1cbb 100644
--- a/argocd/applications/templates/aws-sm-proxy.yaml
+++ b/argocd/applications/templates/aws-sm-proxy.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/botkube.yaml b/argocd/applications/templates/botkube.yaml
index 1e3914cdd..71555ed11 100644
--- a/argocd/applications/templates/botkube.yaml
+++ b/argocd/applications/templates/botkube.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/capi-operator-pre.yaml b/argocd/applications/templates/capi-operator-pre.yaml
index 54ac1e54f..44632c3b9 100644
--- a/argocd/applications/templates/capi-operator-pre.yaml
+++ b/argocd/applications/templates/capi-operator-pre.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/capi-operator.yaml b/argocd/applications/templates/capi-operator.yaml
index 6efcbedda..171871d0a 100644
--- a/argocd/applications/templates/capi-operator.yaml
+++ b/argocd/applications/templates/capi-operator.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/capi-providers-config.yaml b/argocd/applications/templates/capi-providers-config.yaml
index f5a1c0d3b..4ea56a8cc 100644
--- a/argocd/applications/templates/capi-providers-config.yaml
+++ b/argocd/applications/templates/capi-providers-config.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/cert-manager.yaml b/argocd/applications/templates/cert-manager.yaml
index 93a6c14fd..55090ed6d 100644
--- a/argocd/applications/templates/cert-manager.yaml
+++ b/argocd/applications/templates/cert-manager.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/cert-synchronizer.yaml b/argocd/applications/templates/cert-synchronizer.yaml
index 3277d997c..beb74e46a 100644
--- a/argocd/applications/templates/cert-synchronizer.yaml
+++ b/argocd/applications/templates/cert-synchronizer.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/certificate-file-server.yaml b/argocd/applications/templates/certificate-file-server.yaml
index 4333ec89c..07ad0452e 100644
--- a/argocd/applications/templates/certificate-file-server.yaml
+++ b/argocd/applications/templates/certificate-file-server.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/cluster-autoscaler.yaml b/argocd/applications/templates/cluster-autoscaler.yaml
index cc8ed19e8..4faff9c21 100644
--- a/argocd/applications/templates/cluster-autoscaler.yaml
+++ b/argocd/applications/templates/cluster-autoscaler.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/cluster-connect-gateway.yaml b/argocd/applications/templates/cluster-connect-gateway.yaml
index 6548f5e0a..72d410faa 100644
--- a/argocd/applications/templates/cluster-connect-gateway.yaml
+++ b/argocd/applications/templates/cluster-connect-gateway.yaml
@@ -4,7 +4,7 @@
 
 {{- $appName        := "cluster-connect-gateway" }} # TODO! update this to the correct app name once decided
 {{- $namespace      := "orch-cluster" }}
-{{- $syncWave       := "2000" }}
+{{- $syncWave       := "150" }}
 ---
 {{- if (index .Values.argo.enabled $appName) }}
 apiVersion: argoproj.io/v1alpha1
@@ -49,6 +49,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/cluster-manager.yaml b/argocd/applications/templates/cluster-manager.yaml
index be2acf9f2..678d20c90 100644
--- a/argocd/applications/templates/cluster-manager.yaml
+++ b/argocd/applications/templates/cluster-manager.yaml
@@ -49,6 +49,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-app-gitea-cred-to-fleet.yaml b/argocd/applications/templates/copy-app-gitea-cred-to-fleet.yaml
index 3a14d71bf..558328cac 100644
--- a/argocd/applications/templates/copy-app-gitea-cred-to-fleet.yaml
+++ b/argocd/applications/templates/copy-app-gitea-cred-to-fleet.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-ca-cert-boots-to-gateway.yaml b/argocd/applications/templates/copy-ca-cert-boots-to-gateway.yaml
index 82a2cc171..71de7ab3c 100644
--- a/argocd/applications/templates/copy-ca-cert-boots-to-gateway.yaml
+++ b/argocd/applications/templates/copy-ca-cert-boots-to-gateway.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-ca-cert-boots-to-infra.yaml b/argocd/applications/templates/copy-ca-cert-boots-to-infra.yaml
index 1e4b08766..aa4f5fd97 100644
--- a/argocd/applications/templates/copy-ca-cert-boots-to-infra.yaml
+++ b/argocd/applications/templates/copy-ca-cert-boots-to-infra.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-ca-cert-gateway-to-cattle.yaml b/argocd/applications/templates/copy-ca-cert-gateway-to-cattle.yaml
index df11c592f..6caa0bc81 100644
--- a/argocd/applications/templates/copy-ca-cert-gateway-to-cattle.yaml
+++ b/argocd/applications/templates/copy-ca-cert-gateway-to-cattle.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-ca-cert-gateway-to-infra.yaml b/argocd/applications/templates/copy-ca-cert-gateway-to-infra.yaml
index 9ff1f682f..cbc9d1d78 100644
--- a/argocd/applications/templates/copy-ca-cert-gateway-to-infra.yaml
+++ b/argocd/applications/templates/copy-ca-cert-gateway-to-infra.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-ca-cert-gitea-to-app.yaml b/argocd/applications/templates/copy-ca-cert-gitea-to-app.yaml
index 6ee75bfd9..aac8f8b0e 100644
--- a/argocd/applications/templates/copy-ca-cert-gitea-to-app.yaml
+++ b/argocd/applications/templates/copy-ca-cert-gitea-to-app.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-ca-cert-gitea-to-cluster.yaml b/argocd/applications/templates/copy-ca-cert-gitea-to-cluster.yaml
index 3b72ec8f1..c1bf0cb3d 100644
--- a/argocd/applications/templates/copy-ca-cert-gitea-to-cluster.yaml
+++ b/argocd/applications/templates/copy-ca-cert-gitea-to-cluster.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-cluster-gitea-cred-to-fleet.yaml b/argocd/applications/templates/copy-cluster-gitea-cred-to-fleet.yaml
index 925070db0..30e8b3670 100644
--- a/argocd/applications/templates/copy-cluster-gitea-cred-to-fleet.yaml
+++ b/argocd/applications/templates/copy-cluster-gitea-cred-to-fleet.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-keycloak-admin-to-infra.yaml b/argocd/applications/templates/copy-keycloak-admin-to-infra.yaml
index 93a2308b3..611e0f2b7 100644
--- a/argocd/applications/templates/copy-keycloak-admin-to-infra.yaml
+++ b/argocd/applications/templates/copy-keycloak-admin-to-infra.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/copy-rs-token-to-cluster.yaml b/argocd/applications/templates/copy-rs-token-to-cluster.yaml
index c44fb2426..2be7e767c 100644
--- a/argocd/applications/templates/copy-rs-token-to-cluster.yaml
+++ b/argocd/applications/templates/copy-rs-token-to-cluster.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/edgenode-dashboards.yaml b/argocd/applications/templates/edgenode-dashboards.yaml
index c8e03478c..edf1e2d76 100644
--- a/argocd/applications/templates/edgenode-dashboards.yaml
+++ b/argocd/applications/templates/edgenode-dashboards.yaml
@@ -44,6 +44,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/edgenode-observability.yaml b/argocd/applications/templates/edgenode-observability.yaml
index 37690fefa..2b339d3e1 100644
--- a/argocd/applications/templates/edgenode-observability.yaml
+++ b/argocd/applications/templates/edgenode-observability.yaml
@@ -44,6 +44,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/external-secrets.yaml b/argocd/applications/templates/external-secrets.yaml
index 54ce33966..9cda6aac2 100644
--- a/argocd/applications/templates/external-secrets.yaml
+++ b/argocd/applications/templates/external-secrets.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/fleet-controller.yaml b/argocd/applications/templates/fleet-controller.yaml
index 416d3042f..05568c267 100644
--- a/argocd/applications/templates/fleet-controller.yaml
+++ b/argocd/applications/templates/fleet-controller.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/fleet-crd.yaml b/argocd/applications/templates/fleet-crd.yaml
index 254717cf6..37fa07baa 100644
--- a/argocd/applications/templates/fleet-crd.yaml
+++ b/argocd/applications/templates/fleet-crd.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/fleet-rs-secret.yaml b/argocd/applications/templates/fleet-rs-secret.yaml
index 1da8f9745..9cd4ea3e2 100644
--- a/argocd/applications/templates/fleet-rs-secret.yaml
+++ b/argocd/applications/templates/fleet-rs-secret.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/harbor-oci.yaml b/argocd/applications/templates/harbor-oci.yaml
index 0ae134677..602ef4270 100644
--- a/argocd/applications/templates/harbor-oci.yaml
+++ b/argocd/applications/templates/harbor-oci.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/infra-core.yaml b/argocd/applications/templates/infra-core.yaml
index 681ecd6e9..74719fdba 100644
--- a/argocd/applications/templates/infra-core.yaml
+++ b/argocd/applications/templates/infra-core.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/infra-external.yaml b/argocd/applications/templates/infra-external.yaml
index b23c41d46..94d123c96 100644
--- a/argocd/applications/templates/infra-external.yaml
+++ b/argocd/applications/templates/infra-external.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/infra-managers.yaml b/argocd/applications/templates/infra-managers.yaml
index dc4b96505..d169d0baf 100644
--- a/argocd/applications/templates/infra-managers.yaml
+++ b/argocd/applications/templates/infra-managers.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/infra-onboarding.yaml b/argocd/applications/templates/infra-onboarding.yaml
index efbc89179..f20dc81b8 100644
--- a/argocd/applications/templates/infra-onboarding.yaml
+++ b/argocd/applications/templates/infra-onboarding.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/ingress-nginx.yaml b/argocd/applications/templates/ingress-nginx.yaml
index 861b2fdf3..d9c7af3da 100644
--- a/argocd/applications/templates/ingress-nginx.yaml
+++ b/argocd/applications/templates/ingress-nginx.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/intel-infra-provider.yaml b/argocd/applications/templates/intel-infra-provider.yaml
index 954fd0d98..f32ac77ff 100644
--- a/argocd/applications/templates/intel-infra-provider.yaml
+++ b/argocd/applications/templates/intel-infra-provider.yaml
@@ -49,6 +49,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/istio-base.yaml b/argocd/applications/templates/istio-base.yaml
index 558d5dab1..0dfe9f814 100644
--- a/argocd/applications/templates/istio-base.yaml
+++ b/argocd/applications/templates/istio-base.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/istio-policy.yaml b/argocd/applications/templates/istio-policy.yaml
index f8b65d50e..a47608182 100644
--- a/argocd/applications/templates/istio-policy.yaml
+++ b/argocd/applications/templates/istio-policy.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/istiod.yaml b/argocd/applications/templates/istiod.yaml
index 4acd69ab0..59980f5f0 100644
--- a/argocd/applications/templates/istiod.yaml
+++ b/argocd/applications/templates/istiod.yaml
@@ -55,6 +55,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/k8s-metrics-server.yaml b/argocd/applications/templates/k8s-metrics-server.yaml
index 12e5bb8ff..843c08a6e 100644
--- a/argocd/applications/templates/k8s-metrics-server.yaml
+++ b/argocd/applications/templates/k8s-metrics-server.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/keycloak-tenant-controller.yaml b/argocd/applications/templates/keycloak-tenant-controller.yaml
index 714b5becc..60c6d6dfa 100644
--- a/argocd/applications/templates/keycloak-tenant-controller.yaml
+++ b/argocd/applications/templates/keycloak-tenant-controller.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/kiali.yaml b/argocd/applications/templates/kiali.yaml
index 99a118d59..2589aadad 100644
--- a/argocd/applications/templates/kiali.yaml
+++ b/argocd/applications/templates/kiali.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/kyverno-extra-policies.yaml b/argocd/applications/templates/kyverno-extra-policies.yaml
index e9c089294..e88637324 100644
--- a/argocd/applications/templates/kyverno-extra-policies.yaml
+++ b/argocd/applications/templates/kyverno-extra-policies.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/kyverno-istio-policy.yaml b/argocd/applications/templates/kyverno-istio-policy.yaml
index 07dc69cab..2c9be323d 100644
--- a/argocd/applications/templates/kyverno-istio-policy.yaml
+++ b/argocd/applications/templates/kyverno-istio-policy.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/kyverno-traefik-policy.yaml b/argocd/applications/templates/kyverno-traefik-policy.yaml
index 56d22d4c4..6888d5494 100644
--- a/argocd/applications/templates/kyverno-traefik-policy.yaml
+++ b/argocd/applications/templates/kyverno-traefik-policy.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/kyverno.yaml b/argocd/applications/templates/kyverno.yaml
index fb2a4eea6..72e2c92a5 100644
--- a/argocd/applications/templates/kyverno.yaml
+++ b/argocd/applications/templates/kyverno.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/metadata-broker.yaml b/argocd/applications/templates/metadata-broker.yaml
index 9b43c852f..ca21c89e4 100644
--- a/argocd/applications/templates/metadata-broker.yaml
+++ b/argocd/applications/templates/metadata-broker.yaml
@@ -4,7 +4,7 @@
 
 {{- $appName        := "metadata-broker" }}
 {{- $namespace      := "orch-ui" }}
-{{- $syncWave       := "2000" }}
+{{- $syncWave       := "150" }}
 ---
 {{- if (index .Values.argo.enabled $appName) }}
 apiVersion: argoproj.io/v1alpha1
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/metallb-config.yaml b/argocd/applications/templates/metallb-config.yaml
index 36a211286..963411703 100644
--- a/argocd/applications/templates/metallb-config.yaml
+++ b/argocd/applications/templates/metallb-config.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/metallb.yaml b/argocd/applications/templates/metallb.yaml
index dd6850ace..92630cbde 100644
--- a/argocd/applications/templates/metallb.yaml
+++ b/argocd/applications/templates/metallb.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
     - CreateNamespace=true
     - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/namespace-label.yaml b/argocd/applications/templates/namespace-label.yaml
deleted file mode 100644
index 38f21c2d3..000000000
--- a/argocd/applications/templates/namespace-label.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- $appName        := "namespace-label" }}
-{{- $namespace      := "ns-label" }}
-{{- $syncWave       := "90" }}
----
-# always deploy this app
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: "{{ $syncWave }}"
-  name: {{$appName}}
-  namespace: {{ required "A valid namespace entry required!" .Values.argo.namespace }}
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: {{ required "A valid projectName entry required!" .Values.argo.project }}
-  sources:
-    - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
-      chart: common/charts/{{$appName}}
-      targetRevision: 25.2.3
-      helm:
-        releaseName: {{$appName}}
-        valuesObject:
-          {{- $customFile := printf "custom/%s.tpl" $appName }}
-          {{- $customConfig := tpl (.Files.Get $customFile) . | fromYaml }}
-          {{- $baseFile := printf "configs/%s.yaml" $appName }}
-          {{- $baseConfig := .Files.Get $baseFile|fromYaml}}
-          {{- mergeOverwrite $baseConfig $customConfig | toYaml | nindent 10 }}
-  destination:
-    namespace: {{$namespace}}
-    server: {{ required "A valid targetServer entry required!" .Values.argo.targetServer }}
-  syncPolicy:
-    {{- if .Values.argo.autosync }}
-    automated:
-      prune: true
-      selfHeal: true
-    retry:
-      limit: 5
-      backoff:
-        duration: 5s
-        maxDuration: 3m0s
-        factor: 2
-    {{- end }}
-    syncOptions:
-      - CreateNamespace=true
-      - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/nexus-api-gw.yaml b/argocd/applications/templates/nexus-api-gw.yaml
index 0503c1c4b..e207b1c45 100644
--- a/argocd/applications/templates/nexus-api-gw.yaml
+++ b/argocd/applications/templates/nexus-api-gw.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/nginx-ingress-pxe-boots.yaml b/argocd/applications/templates/nginx-ingress-pxe-boots.yaml
index f4390fc7c..f144d83e1 100644
--- a/argocd/applications/templates/nginx-ingress-pxe-boots.yaml
+++ b/argocd/applications/templates/nginx-ingress-pxe-boots.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/observability-tenant-controller.yaml b/argocd/applications/templates/observability-tenant-controller.yaml
index 720f29c8f..757a2194a 100644
--- a/argocd/applications/templates/observability-tenant-controller.yaml
+++ b/argocd/applications/templates/observability-tenant-controller.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/oci-secret.yaml b/argocd/applications/templates/oci-secret.yaml
index 926ad6589..f734fe9ed 100644
--- a/argocd/applications/templates/oci-secret.yaml
+++ b/argocd/applications/templates/oci-secret.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/orchestrator-dashboards.yaml b/argocd/applications/templates/orchestrator-dashboards.yaml
index ab6f90442..5d67b8c24 100644
--- a/argocd/applications/templates/orchestrator-dashboards.yaml
+++ b/argocd/applications/templates/orchestrator-dashboards.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/orchestrator-observability.yaml b/argocd/applications/templates/orchestrator-observability.yaml
index af519e611..8d8fe55d9 100644
--- a/argocd/applications/templates/orchestrator-observability.yaml
+++ b/argocd/applications/templates/orchestrator-observability.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/orchestrator-prometheus-agent.yaml b/argocd/applications/templates/orchestrator-prometheus-agent.yaml
index dafab6487..2d8932427 100644
--- a/argocd/applications/templates/orchestrator-prometheus-agent.yaml
+++ b/argocd/applications/templates/orchestrator-prometheus-agent.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/platform-autocert.yaml b/argocd/applications/templates/platform-autocert.yaml
index 1871c6ea8..146691431 100644
--- a/argocd/applications/templates/platform-autocert.yaml
+++ b/argocd/applications/templates/platform-autocert.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/platform-keycloak.yaml b/argocd/applications/templates/platform-keycloak.yaml
index fbf98e61c..e2943ad48 100644
--- a/argocd/applications/templates/platform-keycloak.yaml
+++ b/argocd/applications/templates/platform-keycloak.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/postgresql-cluster.yaml b/argocd/applications/templates/postgresql-cluster.yaml
index 3f2461fbf..8f4d14ec9 100644
--- a/argocd/applications/templates/postgresql-cluster.yaml
+++ b/argocd/applications/templates/postgresql-cluster.yaml
@@ -44,6 +44,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/postgresql-operator.yaml b/argocd/applications/templates/postgresql-operator.yaml
index 15956f5c2..a5bb50f0c 100644
--- a/argocd/applications/templates/postgresql-operator.yaml
+++ b/argocd/applications/templates/postgresql-operator.yaml
@@ -44,6 +44,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/postgresql-secrets.yaml b/argocd/applications/templates/postgresql-secrets.yaml
index 7b9ed4db0..6f7c58297 100644
--- a/argocd/applications/templates/postgresql-secrets.yaml
+++ b/argocd/applications/templates/postgresql-secrets.yaml
@@ -38,12 +38,17 @@ spec:
       prune: true
       selfHeal: true
     retry:
-      limit: 5
+      limit: 10
       backoff:
         duration: 5s
-        maxDuration: 3m0s
+        maxDuration: 30m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/prometheus-crd.yaml b/argocd/applications/templates/prometheus-crd.yaml
index 458530176..1c2a1ccc5 100644
--- a/argocd/applications/templates/prometheus-crd.yaml
+++ b/argocd/applications/templates/prometheus-crd.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/reloader.yaml b/argocd/applications/templates/reloader.yaml
index 6c2faa93f..62d90574d 100644
--- a/argocd/applications/templates/reloader.yaml
+++ b/argocd/applications/templates/reloader.yaml
@@ -44,6 +44,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/rs-image-pull-secrets.yaml b/argocd/applications/templates/rs-image-pull-secrets.yaml
index 269f3876f..014ff8815 100644
--- a/argocd/applications/templates/rs-image-pull-secrets.yaml
+++ b/argocd/applications/templates/rs-image-pull-secrets.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/rs-proxy.yaml b/argocd/applications/templates/rs-proxy.yaml
index 3f3f14cc3..334f1b3a3 100644
--- a/argocd/applications/templates/rs-proxy.yaml
+++ b/argocd/applications/templates/rs-proxy.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/secret-wait-azure-ad-creds.yaml b/argocd/applications/templates/secret-wait-azure-ad-creds.yaml
index 22ede39bd..5ad370d65 100644
--- a/argocd/applications/templates/secret-wait-azure-ad-creds.yaml
+++ b/argocd/applications/templates/secret-wait-azure-ad-creds.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/secret-wait-rs-token.yaml b/argocd/applications/templates/secret-wait-rs-token.yaml
index d72006ac7..4e8875b0b 100644
--- a/argocd/applications/templates/secret-wait-rs-token.yaml
+++ b/argocd/applications/templates/secret-wait-rs-token.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/secret-wait-tls-boots.yaml b/argocd/applications/templates/secret-wait-tls-boots.yaml
index 9056b41a0..21879cfa2 100644
--- a/argocd/applications/templates/secret-wait-tls-boots.yaml
+++ b/argocd/applications/templates/secret-wait-tls-boots.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/secret-wait-tls-orch.yaml b/argocd/applications/templates/secret-wait-tls-orch.yaml
index f7644abcb..e779142ba 100644
--- a/argocd/applications/templates/secret-wait-tls-orch.yaml
+++ b/argocd/applications/templates/secret-wait-tls-orch.yaml
@@ -47,6 +47,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/secrets-config.yaml b/argocd/applications/templates/secrets-config.yaml
index 109ee2afa..0041cf040 100644
--- a/argocd/applications/templates/secrets-config.yaml
+++ b/argocd/applications/templates/secrets-config.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/self-signed-cert.yaml b/argocd/applications/templates/self-signed-cert.yaml
index b86bbf94d..900101d61 100644
--- a/argocd/applications/templates/self-signed-cert.yaml
+++ b/argocd/applications/templates/self-signed-cert.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/squid-proxy.yaml b/argocd/applications/templates/squid-proxy.yaml
index 913358a0e..90e35ad36 100644
--- a/argocd/applications/templates/squid-proxy.yaml
+++ b/argocd/applications/templates/squid-proxy.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/sre-exporter.yaml b/argocd/applications/templates/sre-exporter.yaml
index 0388c2fcf..b9620946d 100644
--- a/argocd/applications/templates/sre-exporter.yaml
+++ b/argocd/applications/templates/sre-exporter.yaml
@@ -59,6 +59,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/tenancy-api-mapping.yaml b/argocd/applications/templates/tenancy-api-mapping.yaml
index 68da4e032..29c52210d 100644
--- a/argocd/applications/templates/tenancy-api-mapping.yaml
+++ b/argocd/applications/templates/tenancy-api-mapping.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/tenancy-datamodel.yaml b/argocd/applications/templates/tenancy-datamodel.yaml
index 92d533775..bad8ebabc 100644
--- a/argocd/applications/templates/tenancy-datamodel.yaml
+++ b/argocd/applications/templates/tenancy-datamodel.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/tenancy-init.yaml b/argocd/applications/templates/tenancy-init.yaml
index 6f327a514..dd19961c2 100644
--- a/argocd/applications/templates/tenancy-init.yaml
+++ b/argocd/applications/templates/tenancy-init.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
 {{- end }}
diff --git a/argocd/applications/templates/tenancy-manager.yaml b/argocd/applications/templates/tenancy-manager.yaml
index f174d82db..96b757a2c 100644
--- a/argocd/applications/templates/tenancy-manager.yaml
+++ b/argocd/applications/templates/tenancy-manager.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/token-fs.yaml b/argocd/applications/templates/token-fs.yaml
index 8abd3b1cf..2153377f0 100644
--- a/argocd/applications/templates/token-fs.yaml
+++ b/argocd/applications/templates/token-fs.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/token-refresh.yaml b/argocd/applications/templates/token-refresh.yaml
index b36aeb2db..dda367565 100644
--- a/argocd/applications/templates/token-refresh.yaml
+++ b/argocd/applications/templates/token-refresh.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/traefik-boots.yaml b/argocd/applications/templates/traefik-boots.yaml
index d95b7adf5..206d2efbc 100644
--- a/argocd/applications/templates/traefik-boots.yaml
+++ b/argocd/applications/templates/traefik-boots.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/traefik-extra-objects.yaml b/argocd/applications/templates/traefik-extra-objects.yaml
index 8b4cad24d..d9a3a48e8 100644
--- a/argocd/applications/templates/traefik-extra-objects.yaml
+++ b/argocd/applications/templates/traefik-extra-objects.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/traefik-pre.yaml b/argocd/applications/templates/traefik-pre.yaml
index e9a2305b2..87dc79497 100644
--- a/argocd/applications/templates/traefik-pre.yaml
+++ b/argocd/applications/templates/traefik-pre.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/traefik.yaml b/argocd/applications/templates/traefik.yaml
index e46f98b8c..373817823 100644
--- a/argocd/applications/templates/traefik.yaml
+++ b/argocd/applications/templates/traefik.yaml
@@ -4,7 +4,7 @@
 
 {{- $appName        := "traefik" }}
 {{- $namespace      := "orch-gateway" }}
-{{- $syncWave       := "1100" }}
+{{- $syncWave       := "150" }}
 ---
 {{- if (index .Values.argo.enabled $appName) }}
 apiVersion: argoproj.io/v1alpha1
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/vault.yaml b/argocd/applications/templates/vault.yaml
index 31d14b93a..b8b2ff4ca 100644
--- a/argocd/applications/templates/vault.yaml
+++ b/argocd/applications/templates/vault.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/vertical-pod-autoscaler.yaml b/argocd/applications/templates/vertical-pod-autoscaler.yaml
index 63e3f6f08..85549e006 100644
--- a/argocd/applications/templates/vertical-pod-autoscaler.yaml
+++ b/argocd/applications/templates/vertical-pod-autoscaler.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/wait-istio-job.yaml b/argocd/applications/templates/wait-istio-job.yaml
deleted file mode 100644
index b268f77f7..000000000
--- a/argocd/applications/templates/wait-istio-job.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- $appName        := "wait-istio-job" }}
-{{- $chartName      := "job-wait" }}
-{{- $namespace      := "ns-label" }}
-{{- $syncWave       := "110" }}
----
-# always deploy this app
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: "{{ $syncWave }}"
-  name: {{$appName}}
-  namespace: {{ required "A valid namespace entry required!" .Values.argo.namespace }}
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: {{ required "A valid projectName entry required!" .Values.argo.project }}
-  sources:
-    - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
-      chart: common/charts/{{$chartName}}
-      targetRevision: 25.2.3
-      helm:
-        releaseName: {{$appName}}
-        valuesObject:
-          {{- $customFile := printf "custom/%s.tpl" $appName }}
-          {{- $customConfig := tpl (.Files.Get $customFile) . | fromYaml }}
-          {{- $baseFile := printf "configs/%s.yaml" $appName }}
-          {{- $baseConfig := .Files.Get $baseFile|fromYaml}}
-          {{- mergeOverwrite $baseConfig $customConfig | toYaml | nindent 10 }}
-  destination:
-    namespace: {{$namespace}}
-    server: {{ required "A valid targetServer entry required!" .Values.argo.targetServer }}
-  syncPolicy:
-    {{- if .Values.argo.autosync }}
-    automated:
-      prune: true
-      selfHeal: true
-    retry:
-      limit: 5
-      backoff:
-        duration: 5s
-        maxDuration: 3m0s
-        factor: 2
-    {{- end }}
-    syncOptions:
-      - CreateNamespace=true
-      - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/web-ui-admin.yaml b/argocd/applications/templates/web-ui-admin.yaml
index 4d15c6c73..1b3d0a3dd 100644
--- a/argocd/applications/templates/web-ui-admin.yaml
+++ b/argocd/applications/templates/web-ui-admin.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/web-ui-app-orch.yaml b/argocd/applications/templates/web-ui-app-orch.yaml
index 8615afc2c..507ddf686 100644
--- a/argocd/applications/templates/web-ui-app-orch.yaml
+++ b/argocd/applications/templates/web-ui-app-orch.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/web-ui-cluster-orch.yaml b/argocd/applications/templates/web-ui-cluster-orch.yaml
index 412d6bd63..631cccf1d 100644
--- a/argocd/applications/templates/web-ui-cluster-orch.yaml
+++ b/argocd/applications/templates/web-ui-cluster-orch.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/web-ui-infra.yaml b/argocd/applications/templates/web-ui-infra.yaml
index 07ccc4be3..e11dcf071 100644
--- a/argocd/applications/templates/web-ui-infra.yaml
+++ b/argocd/applications/templates/web-ui-infra.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/templates/web-ui-root.yaml b/argocd/applications/templates/web-ui-root.yaml
index 12439db18..89f25c68a 100644
--- a/argocd/applications/templates/web-ui-root.yaml
+++ b/argocd/applications/templates/web-ui-root.yaml
@@ -46,6 +46,11 @@ spec:
         maxDuration: 3m0s
         factor: 2
     {{- end }}
+    {{- if index .Values.argo.namespaceLabels $namespace }}
+    managedNamespaceMetadata:
+      labels:
+      {{- index .Values.argo.namespaceLabels $namespace | toYaml | nindent 8 }}
+    {{- end }}
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
diff --git a/argocd/applications/values.yaml b/argocd/applications/values.yaml
index b839a4aa7..8339791f9 100644
--- a/argocd/applications/values.yaml
+++ b/argocd/applications/values.yaml
@@ -24,3 +24,30 @@ argo:
         name: rps
   traefik:
     tlsOption: "gateway-tls"
+  namespaceLabels:
+    orch-infra:
+      istio-injection: enabled
+    orch-iam:
+      istio-injection: enabled
+    orch-app:
+      istio-injection: enabled
+    orch-cluster:
+      istio-injection: enabled
+    orch-ui:
+      istio-injection: enabled
+    orch-platform:
+      istio-injection: enabled
+    orch-harbor:
+      istio-injection: enabled
+    orch-gateway:
+      istio-injection: enabled
+    orch-sre:
+      istio-injection: enabled
+    orch-database:
+      istio-injection: enabled
+    orch-boots:
+      istio-injection: enabled
+    orch-secret:
+      istio-injection: enabled
+    fleet-default:
+      app.edge-orchestrator.intel.com/fleet-rs-secret: "true"