diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 193fea0..d4b471d 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.7.12
+version: 0.7.13
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/deployment-ausf.yaml b/5g-control-plane/templates/deployment-ausf.yaml
index b5083e0..da8fcfa 100644
--- a/5g-control-plane/templates/deployment-ausf.yaml
+++ b/5g-control-plane/templates/deployment-ausf.yaml
@@ -35,8 +35,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-ausf-module2
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup ausf; do echo waiting for ausf; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
 {{ tuple "ausf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-nssf.yaml b/5g-control-plane/templates/deployment-nssf.yaml
index 0397d54..a1202b5 100644
--- a/5g-control-plane/templates/deployment-nssf.yaml
+++ b/5g-control-plane/templates/deployment-nssf.yaml
@@ -33,8 +33,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-nssf-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup nssf; do echo waiting for nssf; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "nssf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-pcf.yaml b/5g-control-plane/templates/deployment-pcf.yaml
index 91eebc5..7619c7f 100644
--- a/5g-control-plane/templates/deployment-pcf.yaml
+++ b/5g-control-plane/templates/deployment-pcf.yaml
@@ -33,8 +33,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-       {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-pcf-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup pcf; do echo waiting for pcf; sleep 4; done;']
+       {{- if .Values.config.coreDump.enabled }}
        {{ tuple "pcf" . | include "5g-control-plane.coredump_init" | indent 6 }}
        {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-sctplb.yaml b/5g-control-plane/templates/deployment-sctplb.yaml
index 945a7b7..d408b56 100644
--- a/5g-control-plane/templates/deployment-sctplb.yaml
+++ b/5g-control-plane/templates/deployment-sctplb.yaml
@@ -33,8 +33,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-nrf-module
+        image: {{ .Values.images.tags.init | quote }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "sctplb" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-smf.yaml b/5g-control-plane/templates/deployment-smf.yaml
index 971c5bd..d60c7f7 100644
--- a/5g-control-plane/templates/deployment-smf.yaml
+++ b/5g-control-plane/templates/deployment-smf.yaml
@@ -35,8 +35,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-smf-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup smf; do echo waiting for smf; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "smf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-udm.yaml b/5g-control-plane/templates/deployment-udm.yaml
index 36a6bdd..c362d00 100644
--- a/5g-control-plane/templates/deployment-udm.yaml
+++ b/5g-control-plane/templates/deployment-udm.yaml
@@ -33,8 +33,16 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-udm-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup udm; do echo waiting for udm; sleep 4; done;']
+      - name: wait-udr-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup udr; do echo waiting for udr; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "udm" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-udr.yaml b/5g-control-plane/templates/deployment-udr.yaml
index ac347d3..75bf1d7 100644
--- a/5g-control-plane/templates/deployment-udr.yaml
+++ b/5g-control-plane/templates/deployment-udr.yaml
@@ -33,8 +33,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-udr-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup udr; do echo waiting for udr; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "udr" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-webui.yaml b/5g-control-plane/templates/deployment-webui.yaml
index 142b9ff..99c44e8 100644
--- a/5g-control-plane/templates/deployment-webui.yaml
+++ b/5g-control-plane/templates/deployment-webui.yaml
@@ -32,8 +32,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-webui-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup webui; do echo waiting for webui; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "webui" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers: