diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml
index 3ddf36747..27e453032 100644
--- a/roles/kubernetes-apps/ansible/tasks/main.yml
+++ b/roles/kubernetes-apps/ansible/tasks/main.yml
@@ -40,7 +40,7 @@
                  }
                ]
              }'
-  when: dns_mode != 'none' and inventory_hostname == groups['kube-master'][0]
+  when: dns_mode != 'none' and inventory_hostname == groups['kube-master'][0] and rbac_enabled
   tags: dnsmasq
 
 - name: Kubernetes Apps | Start Resources
@@ -60,4 +60,3 @@
   include: tasks/netchecker.yml
   when: deploy_netchecker
   tags: netchecker
-
diff --git a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
index 847290d9e..65feeee65 100644
--- a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
@@ -41,9 +41,6 @@ spec:
     - mountPath: "{{ kube_config_dir }}/ssl"
       name: etc-kube-ssl
       readOnly: true
-    - mountPath: {{kube_config_dir}}/kube-proxy-kubeconfig.yaml
-      name: "kubeconfig"
-      readOnly: true
     - mountPath: "{{ kube_config_dir }}/kube-proxy-kubeconfig.yaml"
       name: kubeconfig
       readOnly: true
@@ -63,10 +60,7 @@ spec:
       path: "{{ kube_config_dir }}/ssl"
   - name: kubeconfig
     hostPath:
-      path: "{{kube_config_dir}}/kube-proxy-kubeconfig.yaml"
-  - name: "etc-kube-ssl"
-    hostPath:
-      path: "{{kube_config_dir}}/ssl"
+      path: "{{ kube_config_dir }}/kube-proxy-kubeconfig.yaml"
   - name: var-run-dbus
     hostPath:
       path: /var/run/dbus