diff --git a/staging/nvidia/Chart.yaml b/staging/nvidia/Chart.yaml
index e35aaa2f9..6d3f280ce 100644
--- a/staging/nvidia/Chart.yaml
+++ b/staging/nvidia/Chart.yaml
@@ -4,7 +4,7 @@ description: Nvidia GPU driver and device plugin for running Nvidia GPU
 keywords:
   - gpu
   - nvidia
-version: 0.3.0
+version: 0.3.1
 appVersion: "0.2.0"
 home: http://github.com/mesosphere/charts/staging
 sources:
diff --git a/staging/nvidia/charts/nvidia-dcgm-exporter/templates/daemonset.yaml b/staging/nvidia/charts/nvidia-dcgm-exporter/templates/daemonset.yaml
index 55eae887c..0d2054097 100644
--- a/staging/nvidia/charts/nvidia-dcgm-exporter/templates/daemonset.yaml
+++ b/staging/nvidia/charts/nvidia-dcgm-exporter/templates/daemonset.yaml
@@ -12,17 +12,17 @@ spec:
       labels:
         name: {{ template "nvidia-dcgm-exporter.fullname" . }}
     spec:
-{{- if .Values.initContainers }}
-      initContainers:
-        {{- toYaml .Values.initContainers | nindent 8 }}
-{{- end }}
 {{- if .Values.tolerations }}
       tolerations:
-{{- toYaml .Values.tolerations | indent 8 }}
+{{- toYaml .Values.tolerations | nindent 8 }}
 {{- end }}
 {{- if .Values.nodeSelector }}
       nodeSelector:
-{{- toYaml .Values.nodeSelector | indent 8 }}
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+{{- end }}
+{{- if .Values.initContainers }}
+      initContainers:
+{{- toYaml .Values.initContainers | nindent 8 }}
 {{- end }}
 {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
@@ -33,7 +33,7 @@ spec:
         imagePullPolicy: {{ .Values.podNvidiaGpuMetricsExporter.image.pullPolicy }}
 {{- if .Values.podNvidiaGpuMetricsExporter.resources }}
         resources:
-{{ toYaml .Values.podNvidiaGpuMetricsExporter.resources | indent 12 }}
+{{- toYaml .Values.podNvidiaGpuMetricsExporter.resources | nindent 12 }}
 {{- end }}
         ports:
         - name: gpu-metrics
@@ -54,7 +54,7 @@ spec:
         imagePullPolicy: {{ .Values.nvidiaDcgmExporter.image.pullPolicy }}
 {{- if .Values.nvidiaDcgmExporter.resources }}
         resources:
-{{- toYaml .Values.nvidiaDcgmExporter.resources | indent 12 }}
+{{- toYaml .Values.nvidiaDcgmExporter.resources | nindent 12 }}
 {{- end }}
         securityContext:
           runAsNonRoot: false
diff --git a/staging/nvidia/charts/nvidia-dcgm-exporter/templates/tests/test-connection.yaml b/staging/nvidia/charts/nvidia-dcgm-exporter/templates/tests/test-connection.yaml
deleted file mode 100644
index e5633cdd3..000000000
--- a/staging/nvidia/charts/nvidia-dcgm-exporter/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "nvidia-dcgm-exporter.fullname" . }}-test-connection"
-  labels:
-{{ include "nvidia-dcgm-exporter.labels" . | indent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['{{ include "nvidia-dcgm-exporter.fullname" . }}:80']
-  restartPolicy: Never
diff --git a/staging/nvidia/charts/nvidia-device-plugin/templates/daemonset.yaml b/staging/nvidia/charts/nvidia-device-plugin/templates/daemonset.yaml
index d2191fdec..d6638b262 100644
--- a/staging/nvidia/charts/nvidia-device-plugin/templates/daemonset.yaml
+++ b/staging/nvidia/charts/nvidia-device-plugin/templates/daemonset.yaml
@@ -14,13 +14,17 @@ spec:
       labels:
         name: {{ template "nvidia-device-plugin.fullname" . }}
     spec:
+{{- if .Values.tolerations }}
+      tolerations:
+{{- toYaml .Values.tolerations | nindent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+{{- end }}
 {{- if .Values.initContainers }}
       initContainers:
 {{- toYaml .Values.initContainers | nindent 8 }}
-{{- end }}
-{{- if .Values.tolerations }}
-      tolerations:
-{{- toYaml .Values.tolerations | indent 8 }}
 {{- end }}
       priorityClassName: {{ .Values.priorityClassName }}
       containers:
@@ -33,15 +37,11 @@ spec:
             drop: ["ALL"]
 {{- if .Values.resources }}
         resources:
-{{- toYaml .Values.resources | indent 12 }}
+{{- toYaml .Values.resources | nindent 12 }}
 {{- end }}
         volumeMounts:
         - name: device-plugin
           mountPath: /var/lib/kubelet/device-plugins
-{{- if .Values.nodeSelector }}
-      nodeSelector:
-{{- toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
       volumes:
       - name: device-plugin
         hostPath:
diff --git a/staging/nvidia/charts/nvidia-device-plugin/templates/tests/test-connection.yaml b/staging/nvidia/charts/nvidia-device-plugin/templates/tests/test-connection.yaml
deleted file mode 100644
index cbd92625d..000000000
--- a/staging/nvidia/charts/nvidia-device-plugin/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "nvidia-device-plugin.fullname" . }}-test-connection"
-  labels:
-{{ include "nvidia-device-plugin.labels" . | indent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['{{ include "nvidia-device-plugin.fullname" . }}:80']
-  restartPolicy: Never
diff --git a/staging/nvidia/charts/nvidia-driver/templates/daemonset.yaml b/staging/nvidia/charts/nvidia-driver/templates/daemonset.yaml
index b2f38996f..67f641629 100644
--- a/staging/nvidia/charts/nvidia-driver/templates/daemonset.yaml
+++ b/staging/nvidia/charts/nvidia-driver/templates/daemonset.yaml
@@ -12,17 +12,17 @@ spec:
       labels:
         name: {{ template "nvidia-driver.fullname" . }}
     spec:
+{{- if .Values.tolerations }}
+      tolerations:
+{{- toYaml .Values.tolerations | nindent 8 }}
+{{- end }}
 {{- if .Values.nodeSelector }}
       nodeSelector:
-{{- toYaml .Values.nodeSelector | indent 8 }}
+{{- toYaml .Values.nodeSelector | nindent 8 }}
 {{- end }}
 {{- if .Values.initContainers }}
       initContainers:
 {{- toYaml .Values.initContainers | nindent 8 }}
-{{- end }}
-{{- if .Values.tolerations }}
-      tolerations:
-{{- toYaml .Values.tolerations | indent 8 }}
 {{- end }}
       priorityClassName: {{ .Values.priorityClassName }}
       hostPID: true
@@ -35,7 +35,7 @@ spec:
           privileged: true
 {{- if .Values.resources }}
         resources:
-{{- toYaml .Values.resources | indent 12 }}
+{{- toYaml .Values.resources | nindent 12 }}
 {{- end }}
         volumeMounts:
         - name: update-driver
diff --git a/staging/nvidia/charts/nvidia-driver/templates/tests/test-connection.yaml b/staging/nvidia/charts/nvidia-driver/templates/tests/test-connection.yaml
deleted file mode 100644
index ebf56ba97..000000000
--- a/staging/nvidia/charts/nvidia-driver/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "nvidia-driver.fullname" . }}-test-connection"
-  labels:
-{{ include "nvidia-driver.labels" . | indent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['{{ include "nvidia-driver.fullname" . }}:80']
-  restartPolicy: Never
diff --git a/staging/nvidia/values.yaml b/staging/nvidia/values.yaml
index c6f866818..95f2b0606 100644
--- a/staging/nvidia/values.yaml
+++ b/staging/nvidia/values.yaml
@@ -3,7 +3,10 @@ grafana:
 
 nvidia-dcgm-exporter:
   enabled: true
-  resources: {}
+  podNvidiaGpuMetricsExporter:
+    resources: {}
+  nvidiaDcgmExporter:
+    resources: {}
   nodeSelector: {}
   tolerations: []
   initContainers: []