diff --git a/kubernetes-templates/MongoDB/0/mongo-controller.yaml b/kubernetes-templates/MongoDB/0/mongo-controller.yaml
index f956a5e..1bf60a6 100644
--- a/kubernetes-templates/MongoDB/0/mongo-controller.yaml
+++ b/kubernetes-templates/MongoDB/0/mongo-controller.yaml
@@ -9,23 +9,42 @@ spec:
   template:
     spec:
       containers:
+      - image: husseingalal/mongo-k8s-config
+        name: mongo-config
+        volumeMounts:
+        - mountPath: /opt/rancher/bin
+          name: utility
+        stdin: true
+        tty: true
       - name: mongo-sec
-        image: husseingalal/mongo-k8s
+        image: mongo:3.4
         ports:
           - containerPort: 27017
         volumeMounts:
-          - name: mongo-ephermal-storage
+          - name: mongo-datadir
             mountPath: /data/db
+          - mountPath: /opt/rancher/bin
+            name: utility
         command:
-          - /run.sh
+          - /opt/rancher/bin/run.sh
           - mongod
           - "--replSet"
           - rs0
           - "--smallfiles"
           - "--noprealloc"
+        env:
+        - name: PRIMARY
+          value: "false"
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
       volumes:
-        - name: mongo-ephermal-storage
-          emptyDir: {}
+      - name: mongo-datadir
+        hostPath:
+          path: /data/db
+      - name: utility
+        emptyDir: {}
     metadata:
       labels:
         secondary: "true"
diff --git a/kubernetes-templates/MongoDB/0/mongo-master.yaml b/kubernetes-templates/MongoDB/0/mongo-master.yaml
index 8e99fe1..49b7ac7 100644
--- a/kubernetes-templates/MongoDB/0/mongo-master.yaml
+++ b/kubernetes-templates/MongoDB/0/mongo-master.yaml
@@ -9,33 +9,49 @@ spec:
     - port: 27017
       targetPort: 27017
   selector:
-    name: mongo-master
+    name: mongo-primary
 ---
 apiVersion: v1
 kind: Pod
 metadata:
   labels:
-          name: mongo-master
-  name: mongo-master
+    name: mongo-primary
+  name: mongo-primary
 spec:
   containers:
-    - name: mongo-master
-      image: "husseingalal/mongo-k8s"
+    - name: mongo-config
+      image: husseingalal/mongo-k8s-config
+      volumeMounts:
+      - mountPath: /opt/rancher/bin
+        name: utility
+      stdin: true
+      tty: true
+    - name: mongo-primary
+      image: mongo:3.4
       env:
-        - name: PRIMARY
-          value: "true"
+      - name: PRIMARY
+        value: "true"
+      - name: POD_IP
+        valueFrom:
+          fieldRef:
+            fieldPath: status.podIP
       ports:
         - containerPort: 27017
       command:
-        - /run.sh
+        - /opt/rancher/bin/run.sh
         - mongod
         - "--replSet"
         - rs0
         - "--smallfiles"
         - "--noprealloc"
       volumeMounts:
+        - mountPath: /opt/rancher/bin
+          name: utility
         - mountPath: /data/db
-          name: mongo-primary-ephermal-storage
+          name: mongo-datadir
   volumes:
-    - name: mongo-primary-ephermal-storage
-      emptyDir: {}
+  - name: mongo-datadir
+    hostPath:
+      path: /data/db
+  - name: utility
+    emptyDir: {}