diff --git a/deploy/asapo_helm_chart/asapo/configs/asapo-broker.json b/deploy/asapo_helm_chart/asapo/configs/asapo-broker.json
index d59aaed6d482c2327b02d757f310fe1302569940..3753878d2cbce843fa612b36b264e83c5a227172 100644
--- a/deploy/asapo_helm_chart/asapo/configs/asapo-broker.json
+++ b/deploy/asapo_helm_chart/asapo/configs/asapo-broker.json
@@ -1,5 +1,5 @@
 {
-  "DatabaseServer":"auto",
+  "DatabaseServer":"asapo-mongodb:{{ .Values.ownServices.mongodb.port }}",
   "DiscoveryServer": "asapo-discovery:{{ .Values.ownServices.discovery.port }}",
   "PerformanceDbServer":"{{ .Chart.Name }}-influxdb:{{ .Values.influxdb.influxdb.service.port }}",
   "PerformanceDbName": "asapo_brokers",
diff --git a/deploy/asapo_helm_chart/asapo/configs/asapo-receiver.json b/deploy/asapo_helm_chart/asapo/configs/asapo-receiver.json
index 1c0d4439c4e56c19bc029e2386bdbe39be6440a3..990fe7465ecb306a6da25b76e7f57474456ccc3f 100644
--- a/deploy/asapo_helm_chart/asapo/configs/asapo-receiver.json
+++ b/deploy/asapo_helm_chart/asapo/configs/asapo-receiver.json
@@ -2,7 +2,7 @@
   "AdvertiseIP": "auto",
   "PerformanceDbServer": "{{ .Chart.Name }}-influxdb:{{ .Values.influxdb.influxdb.service.port }}",
   "PerformanceDbName": "asapo_receivers",
-  "DatabaseServer": "auto",
+  "DatabaseServer": "asapo-mongodb:{{ .Values.ownServices.mongodb.port }}",
   "DiscoveryServer": "asapo-discovery:{{ .Values.ownServices.discovery.port }}",
   "AuthorizationServer": "asapo-authorizer:{{ .Values.ownServices.authorizer.port }}",
   "AuthorizationInterval": 10000,
diff --git a/deploy/asapo_helm_chart/asapo/templates/broker-deployment.yaml b/deploy/asapo_helm_chart/asapo/templates/broker-deployment.yaml
index 8c88d8ea0f53bc669b4dae2500191d3824b6b69e..2f2b26f5ab8f150a634de699d6b76064d5bc59c7 100644
--- a/deploy/asapo_helm_chart/asapo/templates/broker-deployment.yaml
+++ b/deploy/asapo_helm_chart/asapo/templates/broker-deployment.yaml
@@ -30,7 +30,7 @@ spec:
       initContainers:
         - name: wait-databases
           image: busybox:1.28
-          command: ['sh', '-c', "echo initializing;until wget asapo-influxdb:8086/ping; do echo waiting for influxdb; sleep 2; done"]
+          command: ['sh', '-c', "echo initializing;until wget -T 2 asapo-influxdb:8086/ping; do echo waiting for influxdb; sleep 2; done"]
       containers:
         - name: asapo-broker
           image: "yakser/asapo-broker-dev:{{ .Values.common.asapoVersionTag }}"
diff --git a/deploy/asapo_helm_chart/asapo/templates/grafana-deployment.yaml b/deploy/asapo_helm_chart/asapo/templates/grafana-deployment.yaml
index 46bd950514e7913d5345e78e0099418224e90ac8..dbc498acf24f14f58781ece47525e0f125a3cb23 100644
--- a/deploy/asapo_helm_chart/asapo/templates/grafana-deployment.yaml
+++ b/deploy/asapo_helm_chart/asapo/templates/grafana-deployment.yaml
@@ -14,10 +14,12 @@ spec:
       labels:
         app: asapo-grafana
     spec:
+      securityContext:
+        fsGroup: 472
       volumes:
         - name: asapo-grafana
           persistentVolumeClaim:
-            claimName: asapo-online-pv
+            claimName: asapo-grafana
       containers:
         - name: asapo-grafana
           image: "grafana/grafana:6.7.1-ubuntu"
diff --git a/deploy/asapo_helm_chart/asapo/templates/mongodb-deployment.yaml b/deploy/asapo_helm_chart/asapo/templates/mongodb-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e012f9fee3b3f5c1d9c3d3dc4c791fac1a6aa4e4
--- /dev/null
+++ b/deploy/asapo_helm_chart/asapo/templates/mongodb-deployment.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: asapo-mongodb
+  labels:
+    app: asapo-mongodb
+spec:
+  replicas: {{ .Values.ownServices.mongodb.replicaCount }}
+  selector:
+    matchLabels:
+      app: asapo-mongodb
+  template:
+    metadata:
+      labels:
+        app: asapo-mongodb
+    spec:
+      volumes:
+        - name: asapo-mongodb
+          persistentVolumeClaim:
+            claimName: asapo-mongodb
+      containers:
+        - name: asapo-mongodb
+          image: "mongo:4.0.0"
+          ports:
+            - containerPort: {{ .Values.ownServices.mongodb.port }}
+          volumeMounts:
+            - mountPath: /data/db
+              name: asapo-mongodb
diff --git a/deploy/asapo_helm_chart/asapo/templates/storage.yaml b/deploy/asapo_helm_chart/asapo/templates/storage.yaml
index 95ab1fd020255112045551b80739c1d84b60e1cf..f6bc55dcdc1ffd5e3353c83b9be53e3bcc2bc4d7 100644
--- a/deploy/asapo_helm_chart/asapo/templates/storage.yaml
+++ b/deploy/asapo_helm_chart/asapo/templates/storage.yaml
@@ -32,4 +32,17 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 1Gi
\ No newline at end of file
+      storage: 1Gi
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: asapo-mongodb
+spec:
+  storageClassName: standard
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 20Gi
\ No newline at end of file
diff --git a/deploy/asapo_helm_chart/asapo/values.yaml b/deploy/asapo_helm_chart/asapo/values.yaml
index a6409c7d6a80868e531b0b58d5a792da861f4620..8e6d175642f594a43d283f1691481987a0b10a1b 100644
--- a/deploy/asapo_helm_chart/asapo/values.yaml
+++ b/deploy/asapo_helm_chart/asapo/values.yaml
@@ -45,6 +45,12 @@ ownServices:
     port: 3000
     sidecarLogs: false
     _exposeServiceExtrernally: false
+  mongodb:
+    serviceName: asapo-mongodb
+    replicaCount: 1
+    port: 27017
+    sidecarLogs: false
+    _exposeServiceExtrernally: false
 
 
 common: