diff --git a/charts/memphis-1.2.4.tgz b/charts/memphis-1.2.4.tgz
new file mode 100644
index 0000000..bc83e97
Binary files /dev/null and b/charts/memphis-1.2.4.tgz differ
diff --git a/memphis/Chart.yaml b/memphis/Chart.yaml
index 495b8d8..f723eb8 100644
--- a/memphis/Chart.yaml
+++ b/memphis/Chart.yaml
@@ -30,7 +30,7 @@ sources:
   - https://github.com/superstreamlabs/memphis
   - https://www.memphis.dev
   
-version: 1.2.3
+version: 1.2.4
 
 appVersion: "1.3.0"
 
diff --git a/memphis/templates/NOTES.txt b/memphis/templates/NOTES.txt
index 92740e8..fec36ad 100644
--- a/memphis/templates/NOTES.txt
+++ b/memphis/templates/NOTES.txt
@@ -9,7 +9,7 @@ Thank you for installing {{ .Chart.Name }}!
 A dev first event-processing platform.
 
 ---------------------------------------------------------------------------------------------------------------------------------------------
-Memphis UI can be accessed on the following DNS name from within your cluster: memphis.{{ .Release.Namespace }}.svc.cluster.local:9000                                                                                        
+Memphis UI can be accessed on the following DNS name from within your cluster: memphis.{{ .Release.Namespace }}.svc.{{ .Values.k8sClusterDomain }}:9000                                                                                        
 
 To access Memphis using UI/CLI/SDK from localhost, run the below commands:                                                                                    
 
diff --git a/memphis/templates/memphis-rest-gateway.yaml b/memphis/templates/memphis-rest-gateway.yaml
index 119db28..8d33ebd 100644
--- a/memphis/templates/memphis-rest-gateway.yaml
+++ b/memphis/templates/memphis-rest-gateway.yaml
@@ -46,7 +46,7 @@ spec:
         - name: k8s-busybox-waits4broker
           image: {{ .Values.busybox.image }}
           imagePullPolicy: {{ .Values.busybox.pullPolicy }}
-          command: ['sh', '-c', "until nslookup {{ include "memphis.svcName" . }}.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for broker; sleep 2; done"]
+          command: ['sh', '-c', "until nslookup {{ include "memphis.svcName" . }}.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.{{ .Values.k8sClusterDomain }} kube-dns.kube-system; do echo waiting for broker; sleep 2; done"]
       containers:
         - name: memphis-rest-gateway
           image: {{ .Values.restGateway.image }}
@@ -61,7 +61,7 @@ spec:
           - name: HTTP_PORT
             value: {{ .Values.restGateway.port | quote }}
           - name: MEMPHIS_HOST
-            value: {{ include "memphis.svcName" . }}.{{ include "memphis.namespace" . }}.svc.cluster.local
+            value: {{ include "memphis.svcName" . }}.{{ include "memphis.namespace" . }}.svc.{{ .Values.k8sClusterDomain }}
           - name: USER_PASS_BASED_AUTH
             value: {{ .Values.memphis.configFile.userPassBasedAuth | quote }}
           - name: ROOT_PASSWORD
diff --git a/memphis/templates/memphis_statefulset.yaml b/memphis/templates/memphis_statefulset.yaml
index bcfc4cc..2122d18 100644
--- a/memphis/templates/memphis_statefulset.yaml
+++ b/memphis/templates/memphis_statefulset.yaml
@@ -198,7 +198,7 @@ spec:
           env:
           - name: NAMESPACE
             value: {{ include "memphis.namespace" . }}
-          command: ['sh', '-c', "until nslookup {{ .Values.metadata.fullnameOverride }}-1.{{ .Values.metadata.fullnameOverride }}-headless.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for memphis-metadata; sleep 2; done"]
+          command: ['sh', '-c', "until nslookup {{ .Values.metadata.fullnameOverride }}-1.{{ .Values.metadata.fullnameOverride }}-headless.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.{{ .Values.k8sClusterDomain }}; do echo waiting for memphis-metadata; sleep 2; done"]
       {{- else }}
         - name: memphis-metadata-readiness
           image: {{ .Values.busybox.image }}
@@ -206,7 +206,7 @@ spec:
           env:
           - name: NAMESPACE
             value: {{ include "memphis.namespace" . }}
-          command: ['sh', '-c', "until nslookup {{ .Values.metadata.fullnameOverride }}-0.{{ .Values.metadata.fullnameOverride }}-headless.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for memphis-metadata; sleep 2; done"]
+          command: ['sh', '-c', "until nslookup {{ .Values.metadata.fullnameOverride }}-0.{{ .Values.metadata.fullnameOverride }}-headless.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.{{ .Values.k8sClusterDomain }}; do echo waiting for memphis-metadata; sleep 2; done"]
       {{- end }}   
       {{- end }}