diff --git a/chart/geosphere-mapserver/templates/deployment.yaml b/chart/geosphere-mapserver/templates/deployment.yaml
index d6e76b489c5cc6cbdf5cf1f7f76484e1db13ce77..61790559f71a965c55a6f7dd596d05e542ec1ac2 100644
--- a/chart/geosphere-mapserver/templates/deployment.yaml
+++ b/chart/geosphere-mapserver/templates/deployment.yaml
@@ -20,20 +20,20 @@ spec:
     {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    volumes:
-      {{- if .Values.source.existingClaim }}
-      - name: src
-        persistentVolumeClaim:
-          claimName: "{{ .Values.source.existingClaim }}"
-      {{- else }}
-      # TODO: For testing only (should require s3 source)
-      - name: src
-        emptyDir: {}
-      {{- end }}
-      # put shapefiles in memory storage (small)
-      - name: dst
-        emptyDir:
-          medium: Memory
+      volumes:
+        {{- if .Values.source.existingClaim }}
+        - name: src
+          persistentVolumeClaim:
+            claimName: "{{ .Values.source.existingClaim }}"
+        {{- else }}
+        # TODO: For testing only (should require s3 source)
+        - name: src
+          emptyDir: {}
+        {{- end }}
+        # put shapefiles in memory storage (small)
+        - name: dst
+          emptyDir:
+            medium: Memory
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -47,6 +47,11 @@ spec:
               value: "{{ join " " .Values.platforms }}"
             - name: WMS_SECTORS
               value: "{{ join " " .Values.sectors }}"
+          volumeMounts:
+            - name: src
+              mountPath: "/data"
+            - name: dst
+              mountPath: "/dst"
           ports:
             - name: http
               containerPort: 80
@@ -66,6 +71,11 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.tileGen.repository }}:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.tileGen.pullPolicy }}
+          volumeMounts:
+            - name: src
+              mountPath: "/data"
+            - name: dst
+              mountPath: "/dst"
           env:
             - name: G2G_PRODUCTS
               value: "{{ join " " .Values.products }}"