diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
index d298f1b08..8be7b517e 100644
--- a/deployment/helm/human-connection/templates/configmap.yml
+++ b/deployment/helm/human-connection/templates/configmap.yml
@@ -6,14 +6,9 @@ dath:
   GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
   NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687"
   CLIENT_URI: "https://{{ .Values.domain }}"
-  NEO4J_apoc_import_file_enabled: {{ .Values.neo4j.apoc_import_file_enabled }}
-  NEO4J_dbms_memory_pagecache_size: {{ .Values.neo4j.dbms_memory_pagecache_size }}
-  NEO4J_dbms_memory_heap_max__size: {{ .Values.neo4j.dbms_memory_heap_max__size }}
-  NEO4J_dbms_memory_heap_initial__size: {{ .Values.neo4j.dbms_memory_heap_initial__size }}
-  NEO4J_dbms_security_procedures_unrestricted: {{ .Values.neo4j.dbms_security_procedures_unrestricted }}
   VERSION: {{ .Chart.AppVersion }}
-  SENTRY_DSN_WEBAPP: {{ .Values.sentry.dsn_webapp }}
-  SENTRY_DSN_BACKEND: {{ .Values.sentry.dsn_backend }}
+  SENTRY_DSN_WEBAPP: {{ .Values.sentryDsnWebapp }}
+  SENTRY_DSN_BACKEND: {{ .Values.sentryDsnBackend }}
   COMMIT: {{ .Values.commit }}
-  SMTP_HOST: {{ .Values.smtp.host }}
-  SMTP_PORT: {{ .Values.smtp.port }}
+  SMTP_HOST: {{ .Values.smtpHost }}
+  SMTP_PORT: {{ .Values.smtpPort }}
diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
new file mode 100644
index 000000000..692533abf
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
@@ -0,0 +1,55 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-neo4j
+spec:
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: "100%"
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-neo4j
+  template:
+    metadata:
+      name: neo4j
+      annotations:
+        backup.velero.io/backup-volumes: neo4j-data
+      labels:
+        human-connection.org/commit: {{ .Values.commit }}
+        human-connection.org/selector: deployment-neo4j
+    spec:
+      containers:
+      - name: neo4j
+        image: humanconnection/neo4j:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        ports:
+        - containerPort: 7687
+        - containerPort: 7474
+        # resources:
+        #   requests:
+        #     memory: "2G"
+        #   limits:
+        #     memory: "8G"
+        env:
+        - name: NEO4J_dbms_security_procedures_unrestricted
+          value: "algo.*,apoc.*"
+          {{- range $key, $val := .Values.neo4jConfig }}
+        - name: NEO4J_{{ $key }}
+          value: {{ $val | quote }}
+          {{- end}}
+        envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-configmap
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+        # volumeMounts:
+        #   - mountPath: /data/
+        #     name: neo4j-data
+      # volumes:
+      # - name: neo4j-data
+      #   persistentVolumeClaim:
+      #     claimName: neo4j-data-claim
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
diff --git a/deployment/helm/human-connection/templates/deployment-web.yaml b/deployment/helm/human-connection/templates/deployment-web.yaml
new file mode 100644
index 000000000..0e432774f
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-web.yaml
@@ -0,0 +1,37 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-webapp
+spec:
+  replicas: 2
+  minReadySeconds: 15
+  progressDeadlineSeconds: 60
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-webapp
+  template:
+    metadata:
+      name: webapp
+      labels:
+        human-connection.org/commit: {{ .Values.commit }}
+        human-connection.org/selector: deployment-webapp
+    spec:
+      containers:
+      - name: webapp
+        image: humanconnection/nitro-web:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-configmap
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+        env:
+        - name: HOST
+          value: 0.0.0.0
+        ports:
+        - containerPort: 3000
+        resources: {}
+        imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+status: {}
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index c15537a83..25a346fae 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -3,30 +3,23 @@ commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
 pullPolicy: Always
 
 # configs
-smtp:
-  host: "mailserver.human-connection"
-  port: "25"
-neo4j:
+smtpHost: "mailserver.human-connection"
+smtpPort: "25"
+smtpUsername:
+smtpPassword:
+sentryDsnWebapp:
+sentryDsnBackend:
+neo4jConfig:
   apoc_import_file_enabled: "true"
   dbms_memory_pagecache_size: "490M"
   dbms_memory_heap_max__size: "500M"
   dbms_memory_heap_initial__size: "500M"
-  dbms_security_procedures_unrestricted: "algo.*,apoc.*"
-sentry:
-  dsn_webapp:
-  dsn_backend:
 
 # secrets
-jwt_secret: b/&&7b78BF&fv/Vd
-private_key_passphrase: a7dsf78sadg87ad87sfagsadg78
-mapbox:
-  token: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
-mongodb:
-  username:
-  password:
-neo4j:
-  username:
-  password:
-smtp:
-  username:
-  password:
+jwtSecret: b/&&7b78BF&fv/Vd
+privateKeyPassphrase: a7dsf78sadg87ad87sfagsadg78
+mapboxToken: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+mongodbUsername:
+mongodbPassword:
+neo4jUsername:
+neo4jPassword: