diff --git a/app.js b/app.js
index 6c4f8da71c68b1256f4f7cf2252ab5c6e83a08eb..0fcf803554252fa95d7f7d2c564e17291c07f9b8 100644
--- a/app.js
+++ b/app.js
@@ -81,7 +81,7 @@ function main() {
   var models
   if (watcherRequired || apiserverRequired) {
     const mongoose = require('mongoose');
-    mongoose.connect(config.mongoDb.url);
+    mongoose.connect(config.mongoDb.url, { useMongoClient: true });
     models = require('./app/models')(mongoose, config);
   }
   if (cmds.includes("watcher")) {
diff --git a/config/custom-environment-variables.hjson b/config/custom-environment-variables.hjson
index cc2c743dd3ee93578252f367c72d45a7c9210b7a..3eb7656ae666b5ea7f709713e01c8d4beca7f0b0 100644
--- a/config/custom-environment-variables.hjson
+++ b/config/custom-environment-variables.hjson
@@ -11,6 +11,9 @@
     "cert": "KUBERNETES_CERT"
     "key":  "KUBERNETES_KEY"
   }
+  mongoDb: {
+    url: "MONGODB_URL"
+  }
   "session_redis": {
     "password": "SESSION_DB_PASSWORD"
   }
diff --git a/deploy.sh b/deploy.sh
index 5c24663855d8739d1b29d315f1b120bdac652c9d..c38c5cdb01f37d7423b645bc38d2eccae0dd3465 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -244,28 +244,64 @@ if [ -n updateDeploy ]; then
     fi
     NOTEBOOK_MONGO_PASS=$(head -1 notebook-db-mongo-pwd.txt)
 
-# check how to use secret
-    cat >notebook-mongo-helm-values.yaml <<EOF
-image:
-  pullPolicy: $pullPolicy
-mongodbRooPassword: "$(cat notebook-db-mongo-pwd.txt)"
-mongodbUsername: "notebookinfo"
-mongodbPassword: "$(cat notebook-db-mongo-pwd.txt)"
-mongodbDatabase: "notebookinfo"
-persistence:
-  enabled: false
+    cat >notebooks-mongo-service.yaml <<EOF
+kind: Service
+apiVersion: v1
+metadata:
+  name: notebooks-mongo
+spec:
+  selector:
+    app: notebooks-mongo
+  ports:
+  - protocol: TCP
+    port: 27017
+    targetPort: 27017
+  type: NodePort
 EOF
-fi
 
-echo "# password secret"
-echo "  kubectl create secret generic notebook-db-mongo-pwd --from-literal=database=notebookinfo --from-literal=user=notebookinfo --from-file=password=notebook-db-mongo-pwd.txt"
-echo "# actual mongo setup"
+    cat >notebooks-mongo-deploy.yaml <<EOF
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: notebooks-mongo
+  labels:
+    app: notebooks-mongo
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: notebooks-mongo
+  template:
+    metadata:
+      labels:
+        app: notebooks-mongo
+    spec:
+      containers:
+      - name: notebooks-mongo
+        image: mongo:3.4
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 27017
+        env:
+        - name: MONGO_INITDB_ROOT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: notebooks-mongo
+              key: password
+        - name: MONGO_INITDB_ROOT_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: notebooks-mongo
+              key: user
+EOF
+fi
 
-echo "  if ! [[ -n \"\$(helm ls $tls notebook-info-db | grep -E '^notebook-info-db\s' )\" ]]; then"
-echo "    helm install $tls --name notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
-echo "  else"
-echo "    helm upgrade $tls notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
-echo "  fi"
+echo "# notebooks info secret"
+echo "  kubectl create secret generic notebooks-mongo --from-literal=database=notebookinfo --from-literal=user=notebookinfo --from-file=password=notebook-db-mongo-pwd.txt" --from-literal=root-connect="mongodb://notebookinfo:$NOTEBOOK_MONGO_PASS@notebooks-mongo/notebookinfo"
+echo "# notebooks info service"
+echo "  kubectl create -f notebooks-mongo-service.yaml"
+echo "# notebooks info deployment"
+echo "  kubectl apply -f notebooks-mongo-deploy.yaml"
 
 echo "## Environment setup: user settings redis db"
 if [ -n updateDeploy ]; then