diff --git a/molgenis/templates/deployment.yaml b/molgenis/templates/deployment.yaml
index a718bba..5aeeff0 100644
--- a/molgenis/templates/deployment.yaml
+++ b/molgenis/templates/deployment.yaml
@@ -49,6 +49,10 @@ spec:
               value: {{ .javaOpts }}
           ports:
             - containerPort: 8080
+          volumeMounts:
+          - name: molgenis-nfs
+            mountPath: "/home/molgenis"
+          restartPolicy: "Never"
           livenessProbe:
             httpGet:
               path: /
@@ -63,6 +67,10 @@ spec:
             periodSeconds: 5
           resources:
 {{ toYaml .resources | indent 12 }}
+        volumes:
+        - name: molgenis-nfs
+          persistentVolumeClaim:
+            claimName: molgenis-nfs-claim
         {{- end }}
 
         - name: elasticsearch
diff --git a/molgenis/templates/persistence/molgenisPersistenceClaim.yaml b/molgenis/templates/persistence/molgenisPersistenceClaim.yaml
new file mode 100644
index 0000000..8c02e3d
--- /dev/null
+++ b/molgenis/templates/persistence/molgenisPersistenceClaim.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.molgenis.persistence.enabled -}}
+apiVersion: extensions/v1beta1
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: molgenis-nfs-claim
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "nfs-provisioner"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+storage: 1Gi
+{{- end }}
\ No newline at end of file
diff --git a/molgenis/values.yaml b/molgenis/values.yaml
index bc931b4..6aa4016 100644
--- a/molgenis/values.yaml
+++ b/molgenis/values.yaml
@@ -66,7 +66,9 @@ elasticsearch:
     cpu: 100m
     memory: 1Gi
 
-nodeSelector: {}
+nodeSelector: {
+  deployPod: "true"
+}
 
 tolerations: []