diff --git a/chart/templates/anchore/namespace.yaml b/chart/templates/anchore/namespace.yaml
index c6ce7c14577dc9d0798476c8d7199e5b6c418e1a..abe004a14bb33124bdb190feadc1b75429450eaa 100644
--- a/chart/templates/anchore/namespace.yaml
+++ b/chart/templates/anchore/namespace.yaml
@@ -3,6 +3,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    app: {{ .Release.Name }}-anchore
+    app.kubernetes.io/name: anchore
+    app.kubernetes.io/component: "security"
+    {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
   name: anchore
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/argocd/namespace.yaml b/chart/templates/argocd/namespace.yaml
index e910b43ca7a767c0a63ea450d5346592cd86084c..5a48cbb31bbc26a2a7d25e6299c9f4abfeafcba2 100644
--- a/chart/templates/argocd/namespace.yaml
+++ b/chart/templates/argocd/namespace.yaml
@@ -6,5 +6,6 @@ metadata:
     app.kubernetes.io/name: authservice
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
   name: argocd
 {{- end }}
diff --git a/chart/templates/gatekeeper/namespace.yaml b/chart/templates/gatekeeper/namespace.yaml
index cb6fe1dcf274a58bfc6f8f7963f4042cfa6f9a7f..b88cd7a34695c5e6448fdeacbcf5b599b658d60d 100644
--- a/chart/templates/gatekeeper/namespace.yaml
+++ b/chart/templates/gatekeeper/namespace.yaml
@@ -9,5 +9,6 @@ metadata:
     app.kubernetes.io/name: gatekeeper
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
   name: gatekeeper-system
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/gitlab/namespace.yaml b/chart/templates/gitlab/namespace.yaml
index 52127acc5b75e2e130184ea5d6f8aa3d265ae884..945eb92e4ff1e661596e427b0301fc46d64860ab 100644
--- a/chart/templates/gitlab/namespace.yaml
+++ b/chart/templates/gitlab/namespace.yaml
@@ -6,5 +6,6 @@ metadata:
     app.kubernetes.io/name: gitlab
     app.kubernetes.io/component: "developer-tools"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
   name: gitlab
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/chart/templates/istio/controlplane/namespace.yaml b/chart/templates/istio/controlplane/namespace.yaml
index 229adcef72bff6f6892f496ab1275283ca2b78ce..e4d9e747fd893213683958a557e98d7b52b9c77e 100644
--- a/chart/templates/istio/controlplane/namespace.yaml
+++ b/chart/templates/istio/controlplane/namespace.yaml
@@ -7,4 +7,5 @@ metadata:
     app.kubernetes.io/name: istio-controlplane
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/keycloak/namespace.yaml b/chart/templates/keycloak/namespace.yaml
index 43bd5d754517e28968e5971b5bf5644c5b87da26..dbafd7aea725740475b3ec309a7014f0fc93ebbe 100644
--- a/chart/templates/keycloak/namespace.yaml
+++ b/chart/templates/keycloak/namespace.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: {{ $name }}
   labels:
-    istio-injection: disabled-because-keycloak-hates-istio
+    istio-injection: disabled
     app.kubernetes.io/name: {{ $name }}
     app.kubernetes.io/component: "security-tools"
     {{- include "commonLabels" . | nindent 4}}
diff --git a/chart/templates/logging/eck-operator/namespace.yaml b/chart/templates/logging/eck-operator/namespace.yaml
index a048f86180367f2f55927b4166786373bcc7ef7c..8231f5c26df8c6ca724c3fd101367a0f3740458e 100644
--- a/chart/templates/logging/eck-operator/namespace.yaml
+++ b/chart/templates/logging/eck-operator/namespace.yaml
@@ -7,4 +7,5 @@ metadata:
     app.kubernetes.io/name: eck-operator
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/mattermost/mattermost/namespace.yaml b/chart/templates/mattermost/mattermost/namespace.yaml
index dc8e75f2bbc63d92e96c2ffa99e36d9523d07bc7..f64aca5b0d0361ef2a4f33e3f698fc82de5f20a2 100644
--- a/chart/templates/mattermost/mattermost/namespace.yaml
+++ b/chart/templates/mattermost/mattermost/namespace.yaml
@@ -7,5 +7,6 @@ metadata:
     app.kubernetes.io/name: mattermost
     app.kubernetes.io/component: "collaboration-tools"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
   name: mattermost
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/monitoring/namespace.yaml b/chart/templates/monitoring/namespace.yaml
index 4b0d611768fb9de1e9986e3b2abe775ef2f25226..2f7400efeec4ada554e562aa03632d11b49350d6 100644
--- a/chart/templates/monitoring/namespace.yaml
+++ b/chart/templates/monitoring/namespace.yaml
@@ -7,4 +7,5 @@ metadata:
     app.kubernetes.io/name: monitoring
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/sonarqube/namespace.yaml b/chart/templates/sonarqube/namespace.yaml
index fec7516c082b3bda14882bbdc6a30158af4bdacd..fee19a19c2dcd7cc51e2e84a30f838451529d578 100644
--- a/chart/templates/sonarqube/namespace.yaml
+++ b/chart/templates/sonarqube/namespace.yaml
@@ -3,4 +3,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: sonarqube
+  labels:
+    app.kubernetes.io/name: sonarqube
+    app.kubernetes.io/component: "developer-tools"
+    {{- include "commonLabels" . | nindent 4}}
+    istio-injection: disabled
 {{- end }}
diff --git a/chart/templates/twistlock/namespace.yaml b/chart/templates/twistlock/namespace.yaml
index 9b17da13fc86728b8b06040283c2179666de77b1..e4562c6543df17d3ba463cd2c27eb047e294a101 100644
--- a/chart/templates/twistlock/namespace.yaml
+++ b/chart/templates/twistlock/namespace.yaml
@@ -7,4 +7,5 @@ metadata:
     app.kubernetes.io/name: twistlock
     app.kubernetes.io/component: "security"
     {{- include "commonLabels" . | nindent 4}}
+    istio-injection: enabled
 {{- end }}
\ No newline at end of file