diff --git a/deploy/chart/templates/daemonset.yaml b/deploy/chart/templates/daemonset.yaml
index bc1eecd6..b9b2effa 100644
--- a/deploy/chart/templates/daemonset.yaml
+++ b/deploy/chart/templates/daemonset.yaml
@@ -18,7 +18,9 @@ spec:
       labels:
         app: ccm-linode
     spec:
+      {{- if ne .Values.rbacEnabled false }}
       serviceAccountName: ccm-linode
+      {{- end }}
       {{- with .Values.securityContext }}
       securityContext:
       {{- toYaml . | nindent 8 }}
@@ -35,7 +37,7 @@ spec:
       tolerations:
       {{- toYaml . | nindent 8 }}
       {{- end }}
-      hostNetwork: {{ default true .Values.enableHostNetwork }}
+      hostNetwork: {{ if hasKey .Values "enableHostNetwork" }}{{ .Values.enableHostNetwork }}{{ else }}true{{ end }}
       containers:
         - image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
index 5f72a000..7da9649c 100644
--- a/deploy/chart/values.yaml
+++ b/deploy/chart/values.yaml
@@ -127,7 +127,7 @@ resources:
 # allowUnauthorizedMetrics: false
 
 # enables host network
-# enableHostNetwork: false
+# enableHostNetwork: true
 
 # specify the update strategy
 # updateStrategy: