diff --git a/5g-control-plane/templates/deployment-amf.yaml b/5g-control-plane/templates/deployment-amf.yaml
index a43e695..e91b188 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -32,6 +32,10 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
+      {{- if .Values.config.coreDump.enabled }}
+      initContainers:
+      {{ tuple "amf" . | include "5g-control-plane.coredump_init" | indent 6 }}
+      {{- end }}
       containers:
       - name: amf
         image: {{ .Values.images.repository }}{{ .Values.images.tags.amf }}
diff --git a/5g-control-plane/templates/deployment-ausf.yaml b/5g-control-plane/templates/deployment-ausf.yaml
index da8fcfa..b5083e0 100644
--- a/5g-control-plane/templates/deployment-ausf.yaml
+++ b/5g-control-plane/templates/deployment-ausf.yaml
@@ -35,12 +35,8 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
 {{ tuple "ausf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-control-plane/templates/deployment-nrf.yaml b/5g-control-plane/templates/deployment-nrf.yaml
index d377920..9e95798 100644
--- a/5g-control-plane/templates/deployment-nrf.yaml
+++ b/5g-control-plane/templates/deployment-nrf.yaml
@@ -35,10 +35,10 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
+      {{- if .Values.config.coreDump.enabled }}
       initContainers:
-{{ tuple "nrf" . | include "5g-control-plane.coredump_init" | indent 6 }}
-    {{- end }}
+      {{ tuple "nrf" . | include "5g-control-plane.coredump_init" | indent 6 }}
+      {{- end }}
       containers:
       - name: nrf
         image: {{ .Values.images.repository }}{{ .Values.images.tags.nrf }}
diff --git a/5g-control-plane/templates/deployment-nssf.yaml b/5g-control-plane/templates/deployment-nssf.yaml
index a5f3061..0397d54 100644
--- a/5g-control-plane/templates/deployment-nssf.yaml
+++ b/5g-control-plane/templates/deployment-nssf.yaml
@@ -33,13 +33,9 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
+    {{ tuple "nssf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
       - name: nssf
diff --git a/5g-control-plane/templates/deployment-pcf.yaml b/5g-control-plane/templates/deployment-pcf.yaml
index 67e6c2f..91eebc5 100644
--- a/5g-control-plane/templates/deployment-pcf.yaml
+++ b/5g-control-plane/templates/deployment-pcf.yaml
@@ -33,14 +33,10 @@
       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 }}
+       {{ tuple "pcf" . | include "5g-control-plane.coredump_init" | indent 6 }}
+       {{- end }}
       containers:
       - name: pcf
         image: {{ .Values.images.repository }}{{ .Values.images.tags.pcf }}
diff --git a/5g-control-plane/templates/deployment-sctplb.yaml b/5g-control-plane/templates/deployment-sctplb.yaml
index 74aeb36..945a7b7 100644
--- a/5g-control-plane/templates/deployment-sctplb.yaml
+++ b/5g-control-plane/templates/deployment-sctplb.yaml
@@ -33,13 +33,9 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
+    {{ tuple "sctplb" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
       - name: sctplb
diff --git a/5g-control-plane/templates/deployment-smf.yaml b/5g-control-plane/templates/deployment-smf.yaml
index 6b9dce0..971c5bd 100644
--- a/5g-control-plane/templates/deployment-smf.yaml
+++ b/5g-control-plane/templates/deployment-smf.yaml
@@ -35,13 +35,9 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
+    {{ tuple "smf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
       - name: smf
diff --git a/5g-control-plane/templates/deployment-udm.yaml b/5g-control-plane/templates/deployment-udm.yaml
index 30062bf..36a6bdd 100644
--- a/5g-control-plane/templates/deployment-udm.yaml
+++ b/5g-control-plane/templates/deployment-udm.yaml
@@ -33,17 +33,9 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
+    {{ tuple "udm" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
       - name: udm
diff --git a/5g-control-plane/templates/deployment-udr.yaml b/5g-control-plane/templates/deployment-udr.yaml
index 81b914c..ac347d3 100644
--- a/5g-control-plane/templates/deployment-udr.yaml
+++ b/5g-control-plane/templates/deployment-udr.yaml
@@ -33,13 +33,9 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
+    {{ tuple "udr" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
       - name: udr
diff --git a/5g-control-plane/templates/deployment-webui.yaml b/5g-control-plane/templates/deployment-webui.yaml
index f023a13..142b9ff 100644
--- a/5g-control-plane/templates/deployment-webui.yaml
+++ b/5g-control-plane/templates/deployment-webui.yaml
@@ -32,13 +32,9 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      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 }}
+      initContainers:
+    {{ tuple "webui" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
       - name: webui