diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml
index f1633e0f..832912ad 100644
--- a/charts/litmus/Chart.yaml
+++ b/charts/litmus/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.14.0"
 description: A Helm chart to install ChaosCenter
 name: litmus
-version: 2.15.10
+version: 2.15.11
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:
diff --git a/charts/litmus/README.md b/charts/litmus/README.md
index b1b8a481..b12b1964 100644
--- a/charts/litmus/README.md
+++ b/charts/litmus/README.md
@@ -1,6 +1,6 @@
 # litmus
 
-![Version: 2.15.10](https://img.shields.io/badge/Version-2.15.10-informational?style=flat-square) ![AppVersion: 2.14.0](https://img.shields.io/badge/AppVersion-2.14.0-informational?style=flat-square)
+![Version: 2.15.11](https://img.shields.io/badge/Version-2.15.11-informational?style=flat-square) ![AppVersion: 2.14.0](https://img.shields.io/badge/AppVersion-2.14.0-informational?style=flat-square)
 
 A Helm chart to install ChaosCenter
 
diff --git a/charts/litmus/templates/_helpers.tpl b/charts/litmus/templates/_helpers.tpl
index 66d9f60b..6b5e1899 100644
--- a/charts/litmus/templates/_helpers.tpl
+++ b/charts/litmus/templates/_helpers.tpl
@@ -79,9 +79,13 @@ Check for existing secret
 {{- end -}}
 
 {{- define "litmus-portal.mongodbServiceName" -}}
-    {{- if not (eq .Values.mongodb.architecture "replicaset") }}
-        {{- include "mongodb.fullname" .Subcharts.mongodb -}}
+    {{- if not .Values.mongodb.enabled }}
+        {{- .Values.adminConfig.DB_SERVER -}}
     {{ else }}
-        {{- include "mongodb.service.nameOverride" .Subcharts.mongodb -}}
+        {{- if not (eq .Values.mongodb.architecture "replicaset") }}
+            {{- include "mongodb.fullname" .Subcharts.mongodb -}}
+        {{ else }}
+            {{- include "mongodb.service.nameOverride" .Subcharts.mongodb -}}
+        {{- end -}}
     {{- end -}}
 {{- end -}}
diff --git a/charts/litmus/templates/auth-server-deployment.yaml b/charts/litmus/templates/auth-server-deployment.yaml
index c06a5a12..b2c1ec67 100644
--- a/charts/litmus/templates/auth-server-deployment.yaml
+++ b/charts/litmus/templates/auth-server-deployment.yaml
@@ -42,7 +42,11 @@ spec:
           command: ["/bin/sh", "-c"]
           args:
             [
+              {{- if .Values.mongodb.enabled }}              
                 "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.mongodb.service.ports.mongodb }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",
+              {{- else }}
+                "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.adminConfig.DB_PORT }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",              
+              {{- end }}              
             ]
           resources:
             {{- toYaml .Values.portal.server.waitForMongodb.resources | nindent 12 }}
diff --git a/charts/litmus/templates/server-deployment.yaml b/charts/litmus/templates/server-deployment.yaml
index 041d5eb9..fe5a28ac 100644
--- a/charts/litmus/templates/server-deployment.yaml
+++ b/charts/litmus/templates/server-deployment.yaml
@@ -41,7 +41,11 @@ spec:
           command: ["/bin/sh", "-c"]
           args:
             [
+              {{- if .Values.mongodb.enabled }}
                 "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.mongodb.service.ports.mongodb }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",
+              {{- else }}
+                "while [[ $(curl -sw '%{http_code}' http://{{ include "litmus-portal.mongodbServiceName" . }}:{{ .Values.adminConfig.DB_PORT }} -o /dev/null) -ne 200 ]]; do sleep 5; echo 'Waiting for the MongoDB to be ready...'; done; echo 'Connection with MongoDB established'",              
+              {{- end }}    
             ]
           resources:
             {{- toYaml .Values.portal.server.waitForMongodb.resources | nindent 12 }}