diff --git a/apache-nas/templates/apache-nas-depl.yaml b/apache-nas/templates/apache-nas-depl.yaml
index f5c66d9..f34b800 100644
--- a/apache-nas/templates/apache-nas-depl.yaml
+++ b/apache-nas/templates/apache-nas-depl.yaml
@@ -1,21 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
   labels:
-    app.camptocamp.com/name: apache-nas
+    app.kubernetes.io/name: apache-nas
   name: apache-nas
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.camptocamp.com/name: apache-nas
-  strategy: {}
+      app.kubernetes.io/name: apache-nas
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        app.camptocamp.com/name: apache-nas
+        app.kubernetes.io/name: apache-nas
     spec:
       containers:
       - image: {{ .Values.docker_image }}
@@ -28,6 +25,9 @@ spec:
         volumeMounts:
           - name: apache-nas-data
             mountPath: /var/www/html
+        {{- if .Values.nas.extraVolumeMounts }}
+        {{- .Values.nas.extraVolumeMounts | toYaml | nindent 10 }}
+        {{- end }}
         command:
           - /bin/bash
         args:
@@ -50,8 +50,10 @@ spec:
         - name: apache-nas-data
           persistentVolumeClaim:
             claimName: {{ .Values.nas.volume.pvc_name }}
+      {{- if .Values.nas.extraVolumes }}
+      {{- .Values.nas.extraVolumes | toYaml | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
         {{- .Values.tolerations | toYaml | nindent 6 }}
       {{- end }}
-status: {}
diff --git a/apache-nas/templates/apache-nas-pvc.yaml b/apache-nas/templates/apache-nas-pvc.yaml
index 3232327..b7258fd 100644
--- a/apache-nas/templates/apache-nas-pvc.yaml
+++ b/apache-nas/templates/apache-nas-pvc.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   {{- end }}
   labels:
-    app.camptocamp.com/name: apache-nas
+    app.kubernetes.io/name: apache-nas
 spec:
   accessModes:
     {{- range .Values.nas.volume.accessModes }}
diff --git a/apache-nas/templates/apache-nas-svc.yaml b/apache-nas/templates/apache-nas-svc.yaml
index e8d69f5..89534f3 100644
--- a/apache-nas/templates/apache-nas-svc.yaml
+++ b/apache-nas/templates/apache-nas-svc.yaml
@@ -4,7 +4,7 @@ metadata:
   name: apache-nas-svc
 spec:
   selector:
-    app.camptocamp.com/name: apache-nas
+    app.kubernetes.io/name: apache-nas
   ports:
     - port: 80
       targetPort: 80
diff --git a/apache-nas/values.yaml b/apache-nas/values.yaml
index 6996cb9..544d52c 100644
--- a/apache-nas/values.yaml
+++ b/apache-nas/values.yaml
@@ -9,6 +9,8 @@ nas:
     - ReadWriteOnce
     annotations:
       helm.sh/resource-policy: keep
+  extraVolumeMounts: []
+  extraVolumes: []
 
 env_variables: []