diff --git a/5g-control-plane/templates/bin/_amf-run.sh.tpl b/5g-control-plane/templates/bin/_amf-run.sh.tpl
index cdc0377..ce0d310 100644
--- a/5g-control-plane/templates/bin/_amf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_amf-run.sh.tpl
@@ -6,21 +6,12 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/amf" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist" 
-fi
-if [ -d "/sdcore/amf" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist" 
-fi 
-
+IMGPATH={{ .Values.config.imagePath }}
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/amf/amf /tmp/coredump/
+cp $IMGPATH/amf/amf /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd $IMGPATH
 cat config/amfcfg.conf
 
 GOTRACEBACK=crash ./amf/amf -amfcfg config/amfcfg.conf
diff --git a/5g-control-plane/templates/bin/_ausf-run.sh.tpl b/5g-control-plane/templates/bin/_ausf-run.sh.tpl
index ec0c519..0307aed 100644
--- a/5g-control-plane/templates/bin/_ausf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_ausf-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/ausf" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/ausf" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/ausf/ausf /tmp/coredump/
+cp /free5gc/ausf/ausf /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 cat config/ausfcfg.conf
 
 GOTRACEBACK=crash ./ausf/ausf -ausfcfg config/ausfcfg.conf
diff --git a/5g-control-plane/templates/bin/_nrf-run.sh.tpl b/5g-control-plane/templates/bin/_nrf-run.sh.tpl
index 97c4402..7caa2e9 100644
--- a/5g-control-plane/templates/bin/_nrf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_nrf-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/nrf" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/nrf" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/nrf/nrf /tmp/coredump/
+cp /free5gc/nrf/nrf /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/nrfcfg.conf
 
diff --git a/5g-control-plane/templates/bin/_nssf-run.sh.tpl b/5g-control-plane/templates/bin/_nssf-run.sh.tpl
index a903d75..2aae4a0 100644
--- a/5g-control-plane/templates/bin/_nssf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_nssf-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/nssf" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/nssf" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/nssf/nssf /tmp/coredump/
+cp /free5gc/nssf/nssf /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/nssfcfg.conf
 
diff --git a/5g-control-plane/templates/bin/_pcf-run.sh.tpl b/5g-control-plane/templates/bin/_pcf-run.sh.tpl
index 1c6f554..9dfee3f 100644
--- a/5g-control-plane/templates/bin/_pcf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_pcf-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/pcf" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/pcf" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/pcf/pcf /tmp/coredump/
+cp /free5gc/pcf/pcf /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/pcfcfg.conf
 
diff --git a/5g-control-plane/templates/bin/_smf-run.sh.tpl b/5g-control-plane/templates/bin/_smf-run.sh.tpl
index 8280a07..aafc97c 100644
--- a/5g-control-plane/templates/bin/_smf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_smf-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/smf" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/smf" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/smf/smf /tmp/coredump/
+cp /free5gc/smf/smf /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/smfcfg.conf
 cat uerouting/uerouting.conf
diff --git a/5g-control-plane/templates/bin/_udm-run.sh.tpl b/5g-control-plane/templates/bin/_udm-run.sh.tpl
index dbc92d8..a171cea 100644
--- a/5g-control-plane/templates/bin/_udm-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_udm-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/udm" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/udm" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/udm/udm /tmp/coredump/
+cp /free5gc/udm/udm /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/udmcfg.conf
 
diff --git a/5g-control-plane/templates/bin/_udr-run.sh.tpl b/5g-control-plane/templates/bin/_udr-run.sh.tpl
index 7dca3e0..900f72a 100644
--- a/5g-control-plane/templates/bin/_udr-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_udr-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/udr" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/udr" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/udr/udr /tmp/coredump/
+cp /free5gc/udr/udr /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/udrcfg.conf
 
diff --git a/5g-control-plane/templates/bin/_webui-run.sh.tpl b/5g-control-plane/templates/bin/_webui-run.sh.tpl
index 522a0e0..5e91d50 100644
--- a/5g-control-plane/templates/bin/_webui-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_webui-run.sh.tpl
@@ -6,21 +6,11 @@
 
 set -xe
 
-DIR=""
-if [ -d "/free5gc/webconsole" ]; then
-  DIR="/free5gc"
-  echo "free5gc directory exist"
-fi
-if [ -d "/sdcore/webconsole" ]; then
-  DIR="/sdcore"
-  echo "sdcore directory exist"
-fi
-
 {{- if .Values.config.coreDump.enabled }}
-cp $DIR/webconsole/webconsole /tmp/coredump/
+cp /free5gc/webconsole/webconsole /tmp/coredump/
 {{- end }}
 
-cd $DIR
+cd /free5gc
 
 cat config/webuicfg.conf
 
diff --git a/5g-control-plane/templates/deployment-amf.yaml b/5g-control-plane/templates/deployment-amf.yaml
index eeecdc5..a6e7cc5 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -33,10 +33,10 @@
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
       initContainers:
-      - name: wait-amf-module
+      - name: wait-nrf-module
         image: {{ .Values.images.tags.init | quote }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ['sh', '-c', 'until nslookup amf; do echo waiting for amf; sleep 4; done;']
+        command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
 {{ tuple "amf" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
@@ -50,7 +50,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/amf-run.sh", "/sdcore/script/amf-run.sh"]
+        command: [ {{ .Values.config.imagePath }}/script/amf-run.sh ]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -73,34 +73,21 @@
 {{ toYaml .Values.resources.amf | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
-          mountPath: /free5gc/script/amf-run.sh
-          subPath: amf-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
         - name: run-script
-          mountPath: /sdcore/script/amf-run.sh
+          mountPath: {{ .Values.config.imagePath }}/script/amf-run.sh
           subPath: amf-run.sh
-        - name: nf-config
-          mountPath: /sdcore/config
+        - name: amf-config
+          mountPath: {{ .Values.config.imagePath }}/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: amf
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: amf
-          defaultMode: 493
       - name: run-script
         configMap:
           name: amf
           defaultMode: 493
-      - name: nf-config
+      - name: amf-config
         configMap:
           name: amf
           defaultMode: 493
diff --git a/5g-control-plane/templates/deployment-ausf.yaml b/5g-control-plane/templates/deployment-ausf.yaml
index 05beb20..295e198 100644
--- a/5g-control-plane/templates/deployment-ausf.yaml
+++ b/5g-control-plane/templates/deployment-ausf.yaml
@@ -53,7 +53,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/ausf-run.sh", "/sdcore/script/ausf-run.sh"]
+        command: ["/free5gc/script/ausf-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -76,29 +76,16 @@
 {{ toYaml .Values.resources.ausf | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/ausf-run.sh
           subPath: ausf-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/ausf-run.sh
-          subPath: ausf-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: ausf
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: ausf
-          defaultMode: 493
       - name: run-script
         configMap:
           name: ausf
diff --git a/5g-control-plane/templates/deployment-nrf.yaml b/5g-control-plane/templates/deployment-nrf.yaml
index 78a2d7f..80075f8 100644
--- a/5g-control-plane/templates/deployment-nrf.yaml
+++ b/5g-control-plane/templates/deployment-nrf.yaml
@@ -49,7 +49,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/nrf-run.sh", "/sdcore/script/nrf-run.sh"]
+        command: ["/free5gc/script/nrf-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -72,29 +72,16 @@
 {{ toYaml .Values.resources.nrf | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/nrf-run.sh
           subPath: nrf-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/nrf-run.sh
-          subPath: nrf-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: nrf
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: nrf
-          defaultMode: 493
       - name: run-script
         configMap:
           name: nrf
diff --git a/5g-control-plane/templates/deployment-nssf.yaml b/5g-control-plane/templates/deployment-nssf.yaml
index 67e7973..2cce254 100644
--- a/5g-control-plane/templates/deployment-nssf.yaml
+++ b/5g-control-plane/templates/deployment-nssf.yaml
@@ -51,7 +51,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/nssf-run.sh", "/sdcore/script/nssf-run.sh"]
+        command: ["/free5gc/script/nssf-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -74,29 +74,16 @@
 {{ toYaml .Values.resources.nssf | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/nssf-run.sh
           subPath: nssf-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/nssf-run.sh
-          subPath: nssf-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: nssf
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: nssf
-          defaultMode: 493
       - name: run-script
         configMap:
           name: nssf
diff --git a/5g-control-plane/templates/deployment-pcf.yaml b/5g-control-plane/templates/deployment-pcf.yaml
index cba34b7..6829ffe 100644
--- a/5g-control-plane/templates/deployment-pcf.yaml
+++ b/5g-control-plane/templates/deployment-pcf.yaml
@@ -51,7 +51,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/pcf-run.sh", "/sdcore/script/pcf-run.sh"]
+        command: ["/free5gc/script/pcf-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -74,29 +74,16 @@
 {{ toYaml .Values.resources.pcf | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/pcf-run.sh
           subPath: pcf-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/pcf-run.sh
-          subPath: pcf-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: pcf
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: pcf
-          defaultMode: 493
       - name: run-script
         configMap:
           name: pcf
diff --git a/5g-control-plane/templates/deployment-smf.yaml b/5g-control-plane/templates/deployment-smf.yaml
index d707658..296bc50 100644
--- a/5g-control-plane/templates/deployment-smf.yaml
+++ b/5g-control-plane/templates/deployment-smf.yaml
@@ -53,7 +53,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/smf-run.sh", "/sdcore/script/smf-run.sh"]
+        command: ["/free5gc/script/smf-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -76,33 +76,18 @@
 {{ toYaml .Values.resources.smf | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/smf-run.sh
           subPath: smf-run.sh
-        - name: nf-config-tmp
+        - name: nf-config
           mountPath: /free5gc/uerouting
-        - name: nf-config-tmp
+        - name: nf-config
           mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/smf-run.sh
-          subPath: smf-run.sh
-        - name: nf-config
-          mountPath: /sdcore/uerouting
-        - name: nf-config
-          mountPath: /sdcore/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: smf
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: smf
-          defaultMode: 493
       - name: run-script
         configMap:
           name: smf
diff --git a/5g-control-plane/templates/deployment-udm.yaml b/5g-control-plane/templates/deployment-udm.yaml
index 962f0ff..2714ef0 100644
--- a/5g-control-plane/templates/deployment-udm.yaml
+++ b/5g-control-plane/templates/deployment-udm.yaml
@@ -55,7 +55,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/udm-run.sh", "/sdcore/script/udm-run.sh"]
+        command: ["/free5gc/script/udm-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -78,29 +78,16 @@
 {{ toYaml .Values.resources.udm | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/udm-run.sh
           subPath: udm-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/udm-run.sh
-          subPath: udm-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: udm
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: udm
-          defaultMode: 493
       - name: run-script
         configMap:
           name: udm
diff --git a/5g-control-plane/templates/deployment-udr.yaml b/5g-control-plane/templates/deployment-udr.yaml
index 1343106..abe6e64 100644
--- a/5g-control-plane/templates/deployment-udr.yaml
+++ b/5g-control-plane/templates/deployment-udr.yaml
@@ -51,7 +51,7 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/udr-run.sh", "/sdcore/script/udr-run.sh"]
+        command: ["/free5gc/script/udr-run.sh"]
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -74,29 +74,16 @@
 {{ toYaml .Values.resources.udr | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/udr-run.sh
           subPath: udr-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/udr-run.sh
-          subPath: udr-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: udr
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: udr
-          defaultMode: 493
       - name: run-script
         configMap:
           name: udr
diff --git a/5g-control-plane/templates/deployment-webui.yaml b/5g-control-plane/templates/deployment-webui.yaml
index d3a2527..c71becb 100644
--- a/5g-control-plane/templates/deployment-webui.yaml
+++ b/5g-control-plane/templates/deployment-webui.yaml
@@ -61,35 +61,22 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/free5gc/script/webui-run.sh", "/sdcore/script/webui-run.sh"]
+        command: ["/free5gc/script/webui-run.sh"]
       {{- if .Values.resources.enabled }}
         resources:
 {{ toYaml .Values.resources.webui | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: run-script-tmp
+        - name: run-script
           mountPath: /free5gc/script/webui-run.sh
           subPath: webui-run.sh
-        - name: nf-config-tmp
-          mountPath: /free5gc/config
-        - name: run-script
-          mountPath: /sdcore/script/webui-run.sh
-          subPath: webui-run.sh
         - name: nf-config
-          mountPath: /sdcore/config
+          mountPath: /free5gc/config
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: run-script-tmp
-        configMap:
-          name: webui
-          defaultMode: 493
-      - name: nf-config-tmp
-        configMap:
-          name: webui
-          defaultMode: 493
       - name: run-script
         configMap:
           name: webui