diff --git a/roles/rbac/templates/calico-cni-plugin-clusterrole.yml b/roles/rbac/templates/calico-cni-plugin-clusterrole.yml
index cc20667ed..e88b67e03 100644
--- a/roles/rbac/templates/calico-cni-plugin-clusterrole.yml
+++ b/roles/rbac/templates/calico-cni-plugin-clusterrole.yml
@@ -3,7 +3,7 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: calico-cni-plugin
-  namespace: kube-system
+  namespace: {{system_namespace}}
 rules:
   - apiGroups: [""]
     resources:
diff --git a/roles/rbac/templates/calico-cni-plugin-clusterrolebinding.yml b/roles/rbac/templates/calico-cni-plugin-clusterrolebinding.yml
index 77a24b013..ac9a4d5e8 100644
--- a/roles/rbac/templates/calico-cni-plugin-clusterrolebinding.yml
+++ b/roles/rbac/templates/calico-cni-plugin-clusterrolebinding.yml
@@ -10,4 +10,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: calico-cni-plugin
-  namespace: kube-system
+  namespace: {{system_namespace}}
diff --git a/roles/rbac/templates/calico-cni-plugin-serviceaccount.yml b/roles/rbac/templates/calico-cni-plugin-serviceaccount.yml
index 0b71f847d..9d6904006 100644
--- a/roles/rbac/templates/calico-cni-plugin-serviceaccount.yml
+++ b/roles/rbac/templates/calico-cni-plugin-serviceaccount.yml
@@ -3,4 +3,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: calico-cni-plugin
-  namespace: kube-system
+  namespace: {{system_namespace}}
diff --git a/roles/rbac/templates/calico-policy-controller-clusterrole.yml b/roles/rbac/templates/calico-policy-controller-clusterrole.yml
index dfc7faf53..85e7e7d22 100644
--- a/roles/rbac/templates/calico-policy-controller-clusterrole.yml
+++ b/roles/rbac/templates/calico-policy-controller-clusterrole.yml
@@ -3,7 +3,7 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: calico-policy-controller
-  namespace: kube-system
+  namespace: {{system_namespace}}
 rules:
   - apiGroups:
     - ""
diff --git a/roles/rbac/templates/calico-policy-controller-clusterrolebinding.yml b/roles/rbac/templates/calico-policy-controller-clusterrolebinding.yml
index 4a3ebc3e8..0a15d5916 100644
--- a/roles/rbac/templates/calico-policy-controller-clusterrolebinding.yml
+++ b/roles/rbac/templates/calico-policy-controller-clusterrolebinding.yml
@@ -10,4 +10,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: calico-policy-controller
-  namespace: kube-system
+  namespace: {{system_namespace}}
diff --git a/roles/rbac/templates/calico-policy-controller-serviceaccount.yml b/roles/rbac/templates/calico-policy-controller-serviceaccount.yml
index 6f7ab0a47..eaf991558 100644
--- a/roles/rbac/templates/calico-policy-controller-serviceaccount.yml
+++ b/roles/rbac/templates/calico-policy-controller-serviceaccount.yml
@@ -3,4 +3,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: calico-policy-controller
-  namespace: kube-system
+  namespace: {{system_namespace}}
diff --git a/roles/rbac/templates/cluster-proportional-autoscaler-clusterrolebinding.yml b/roles/rbac/templates/cluster-proportional-autoscaler-clusterrolebinding.yml
index 53c69fc21..8e4d77ac4 100644
--- a/roles/rbac/templates/cluster-proportional-autoscaler-clusterrolebinding.yml
+++ b/roles/rbac/templates/cluster-proportional-autoscaler-clusterrolebinding.yml
@@ -10,5 +10,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: cluster-proportional-autoscaler
-  namespace: kube-system
+  namespace: {{system_namespace}}
 
diff --git a/roles/rbac/templates/cluster-proportional-autoscaler-serviceaccount.yml b/roles/rbac/templates/cluster-proportional-autoscaler-serviceaccount.yml
index 933782ef6..7707b774d 100644
--- a/roles/rbac/templates/cluster-proportional-autoscaler-serviceaccount.yml
+++ b/roles/rbac/templates/cluster-proportional-autoscaler-serviceaccount.yml
@@ -3,4 +3,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: cluster-proportional-autoscaler
-  namespace: kube-system
+  namespace: {{system_namespace}}
diff --git a/roles/rbac/templates/custom:system:kube-dns-clusterrolebinding.yml b/roles/rbac/templates/custom:system:kube-dns-clusterrolebinding.yml
index 0b31f34fc..942080f96 100644
--- a/roles/rbac/templates/custom:system:kube-dns-clusterrolebinding.yml
+++ b/roles/rbac/templates/custom:system:kube-dns-clusterrolebinding.yml
@@ -10,4 +10,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: kube-dns
-  namespace: kube-system
+  namespace: {{system_namespace}}
diff --git a/roles/rbac/templates/kubedns-serviceaccount.yml b/roles/rbac/templates/kubedns-serviceaccount.yml
index 4e5a85660..d94f0664c 100644
--- a/roles/rbac/templates/kubedns-serviceaccount.yml
+++ b/roles/rbac/templates/kubedns-serviceaccount.yml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: kube-dns
-  namespace: kube-system
+  namespace: {{system_namespace}}