diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
index 0f303ade0..4e25227d7 100644
--- a/deployment/helm/human-connection/Chart.yaml
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "0.1.0"
+appVersion: "0.2.2"
 description: A Helm chart for Human Connection
 name: human-connection
 version: 0.1.0
diff --git a/deployment/helm/human-connection/templates/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/letsencrypt-prod.yaml
rename to deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
diff --git a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/letsencrypt-staging.yaml
rename to deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
similarity index 84%
rename from deployment/helm/human-connection/templates/deployment-backend.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index e30e66431..68d582d41 100644
--- a/deployment/helm/human-connection/templates/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-backend
-  namespace: human-connection
 spec:
   replicas: 1
   minReadySeconds: 15
@@ -26,7 +25,11 @@ spec:
       containers:
       - name: backend
         image: humanconnection/nitro-backend:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "{{ .Values.application.initializeCommand }}", "&&", "{{ .Values.application.migrationsCommand }}"]
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
similarity index 91%
rename from deployment/helm/human-connection/templates/deployment-mailserver.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
index 4bc8eaadc..608fb8092 100644
--- a/deployment/helm/human-connection/templates/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-mailserver
-  namespace: human-connection
 spec:
   replicas: 1
   minReadySeconds: 15
@@ -20,7 +19,7 @@ spec:
       containers:
       - name: mailserver
         image: djfarrelly/maildev
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 80
         - containerPort: 25
diff --git a/deployment/helm/human-connection/templates/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
similarity index 95%
rename from deployment/helm/human-connection/templates/deployment-maintenance.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
index c414fb452..ee877f16e 100644
--- a/deployment/helm/human-connection/templates/deployment-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-maintenance
-  namespace: human-connection
 spec:
   selector:
     matchLabels:
diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
similarity index 87%
rename from deployment/helm/human-connection/templates/deployment-neo4j.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
index c157832dd..0f75434ae 100644
--- a/deployment/helm/human-connection/templates/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-neo4j
-  namespace: human-connection
 spec:
   replicas: 1
   strategy:
@@ -23,8 +22,8 @@ spec:
     spec:
       containers:
       - name: neo4j
-        image: humanconnection/neo4j:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: humanconnection/neo4j:0.2.2
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 7687
         - containerPort: 7474
@@ -36,12 +35,10 @@ spec:
         env:
         - name: NEO4J_dbms_security_procedures_unrestricted
           value: "algo.*,apoc.*"
-        - name: SECURE_FILE_PERMISSIONS
-          value: "yes"
           {{- range $key, $val := .Values.neo4jConfig }}
         - name: NEO4J_{{ $key }}
           value: {{ $val | quote }}
-          {{- end}}
+          {{- end }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
similarity index 86%
rename from deployment/helm/human-connection/templates/deployment-web.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index 1f8930612..f9fc3d747 100644
--- a/deployment/helm/human-connection/templates/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-webapp
-  namespace: human-connection
 spec:
   replicas: 2
   minReadySeconds: 15
@@ -19,8 +18,8 @@ spec:
     spec:
       containers:
       - name: webapp
-        image: humanconnection/nitro-web:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: humanconnection/nitro-web:0.2.2
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
similarity index 96%
rename from deployment/helm/human-connection/templates/ingress.template.yaml
rename to deployment/helm/human-connection/templates/ingress/ingress.template.yaml
index 12ef4c9c4..434e2b3dd 100644
--- a/deployment/helm/human-connection/templates/ingress.template.yaml
+++ b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
@@ -2,7 +2,6 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name:  {{ .Release.Name }}-ingress
-  namespace: human-connection
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: {{ .Values.letsencryptIssuer }}
diff --git a/deployment/helm/human-connection/templates/service-backend.yaml b/deployment/helm/human-connection/templates/services/service-backend.yaml
similarity index 87%
rename from deployment/helm/human-connection/templates/service-backend.yaml
rename to deployment/helm/human-connection/templates/services/service-backend.yaml
index d750703a8..b9d40ef8a 100644
--- a/deployment/helm/human-connection/templates/service-backend.yaml
+++ b/deployment/helm/human-connection/templates/services/service-backend.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-backend
-  namespace: human-connection
 spec:
   ports:
     - name: graphql
diff --git a/deployment/helm/human-connection/templates/service-mailserver.yaml b/deployment/helm/human-connection/templates/services/service-mailserver.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/service-mailserver.yaml
rename to deployment/helm/human-connection/templates/services/service-mailserver.yaml
diff --git a/deployment/helm/human-connection/templates/service-maintenance.yaml b/deployment/helm/human-connection/templates/services/service-maintenance.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/service-maintenance.yaml
rename to deployment/helm/human-connection/templates/services/service-maintenance.yaml
diff --git a/deployment/helm/human-connection/templates/service-neo4j.yaml b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
similarity index 89%
rename from deployment/helm/human-connection/templates/service-neo4j.yaml
rename to deployment/helm/human-connection/templates/services/service-neo4j.yaml
index ec3bb1b6c..547dad6c7 100644
--- a/deployment/helm/human-connection/templates/service-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-neo4j
-  namespace: human-connection
 spec:
   ports:
   - name: bolt
diff --git a/deployment/helm/human-connection/templates/service-webapp.yaml b/deployment/helm/human-connection/templates/services/service-webapp.yaml
similarity index 89%
rename from deployment/helm/human-connection/templates/service-webapp.yaml
rename to deployment/helm/human-connection/templates/services/service-webapp.yaml
index f6ea7206f..99677aa05 100644
--- a/deployment/helm/human-connection/templates/service-webapp.yaml
+++ b/deployment/helm/human-connection/templates/services/service-webapp.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-webapp
-  namespace: human-connection
 spec:
   ports:
     - name: {{ .Release.Name }}-webapp
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 8efcd0c06..0e86c74b8 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -1,24 +1,32 @@
 domain: develop.human-connection.org
 commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
-pullPolicy: Always
 
 # configs
+application:
+  initializeCommand: "yarn prod:migrate init"
+  migrationsCommand: "yarn prod:migrate up"
 developmentMailserverDomain: "mailserver.human-connection.org"
 humanConnectionDomain: "develop.human-connection.org"
-supportEmail: "devcom@human-connection.org"
+image:
+  pullPolicy: Always
 letsencryptIssuer: "letsencrypt-prod"
-smtpHost: "mailserver.human-connection"
-smtpPort: "25"
-smtpUsername:
-smtpPassword:
-neo4jResourceRequestsMemory: "1G"
-neo4jResourceLimitsMemory: "2G"
 neo4jConfig:
   apoc_import_file_enabled: "true"
   dbms_memory_pagecache_size: "490M"
   dbms_memory_heap_max__size: "500M"
   dbms_memory_heap_initial__size: "500M"
-
+neo4jResourceLimitsMemory: "2G"
+neo4jResourceRequestsMemory: "1G"
+supportEmail: "devcom@human-connection.org"
+smtpHost: "mailserver.human-connection"
+smtpPort: "25"
+smtpUsername:
+smtpPassword:
+volumes:
+  uploads:
+    storage: 5Gi
+  neo4jData:
+    storage: 8Gi
 # secrets
 jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA=="
 privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
diff --git a/deployment/human-connection/deployment-backend.yaml b/deployment/human-connection/deployment-backend.yaml
index 0f75127e5..00aab9ffd 100644
--- a/deployment/human-connection/deployment-backend.yaml
+++ b/deployment/human-connection/deployment-backend.yaml
@@ -38,7 +38,7 @@ spec:
             name: human-connection
         image: humanconnection/nitro-backend:latest
         imagePullPolicy: Always
-        name: nitro-backend
+        name: backend
         ports:
         - containerPort: 4000
           protocol: TCP
diff --git a/deployment/volumes/uploads.yaml b/deployment/volumes/uploads.yaml
index 2bd64c9ee..ce87b2184 100644
--- a/deployment/volumes/uploads.yaml
+++ b/deployment/volumes/uploads.yaml
@@ -9,4 +9,4 @@
       - ReadWriteOnce
     resources:
       requests:
-        storage: 25Gi
+        storage: 8Gi