diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
index 23d08ec5668ac3219a2ad135a3eae49f6adb9b92..4314482314aaf13cd7d549b8147d82f811e9a344 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
@@ -43,9 +43,7 @@ spec:
           securityContext:
             runAsUser: {{ netchecker_agent_user | default('0') }}
             runAsGroup: {{ netchecker_agent_group | default('0') }}
-{% if rbac_enabled %}
       serviceAccountName: netchecker-agent
-{% endif %}
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 100%
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
index cd8f2c9f3cf33518118054df65499bbf4c244018..ad32d509a13b6a0791f51e71d363d4de9ebecbf4 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
@@ -47,9 +47,7 @@ spec:
           securityContext:
             runAsUser: {{ netchecker_agent_user | default('0') }}
             runAsGroup: {{ netchecker_agent_group | default('0') }}
-{% if rbac_enabled %}
       serviceAccountName: netchecker-agent
-{% endif %}
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 100%
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
index 8d6fbbfd7a9ec23a61a189b8b83f56913c13c891..0a04c40d13449e3d22e62f8ef68e7914176e8348 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
@@ -21,9 +21,7 @@ spec:
         kubernetes.io/cluster-service: "true"
         version: v{{ registry_proxy_image_tag }}
     spec:
-{% if rbac_enabled %}
       serviceAccountName: registry-proxy
-{% endif %}
       containers:
         - name: registry-proxy
           image: {{ registry_proxy_image_repo }}:{{ registry_proxy_image_tag }}
diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
index 627144cd4c2be7e31981b4fa2e36fb5efcb12a6b..3ca8e217d3d1f3b4b00e4e78625a0c00ea054a6f 100644
--- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
@@ -22,9 +22,7 @@ spec:
         version: v{{ registry_image_tag }}
         kubernetes.io/cluster-service: "true"
     spec:
-{% if rbac_enabled %}
       serviceAccountName: registry
-{% endif %}
       containers:
         - name: registry
           image: {{ registry_image_repo }}:{{ registry_image_tag }}