diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
index 0f275bb55816a769e06a4755987e6322cb438dc0..7fd3a946cbc9beeef1ba0bff862cb628b21aef52 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
@@ -21,7 +21,6 @@ spec:
         k8s-app: ingress-nginx
         version: v{{ ingress_nginx_controller_image_tag }}
     spec:
-      serviceAccountName: ingress-nginx
       containers:
         - name: ingress-nginx-controller
           image: {{ ingress_nginx_controller_image_repo }}:{{ ingress_nginx_controller_image_tag }}
@@ -68,3 +67,6 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+{% if rbac_enabled %}
+      serviceAccountName: ingress-nginx
+{% endif %}
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-ns.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-ns.yml.j2
index 75958948ab530a3de378eba4ea3acef5b8724a4b..1f1236619918d2ce2b36c870adcbe9440e2e473a 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-ns.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-ns.yml.j2
@@ -3,3 +3,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ ingress_nginx_namespace }}
+  labels:
+    name: {{ ingress_nginx_namespace }}