diff --git a/ci-scripts/dsTesterDockerCompose/amf-healthy-check.sh b/ci-scripts/dsTesterDockerCompose/amf-healthy-check.sh
index 95792ef89711d190b474dbec28d2f361bf38ce2e..628091a0a1ce5845d3f703a9e50f89912db66652 100755
--- a/ci-scripts/dsTesterDockerCompose/amf-healthy-check.sh
+++ b/ci-scripts/dsTesterDockerCompose/amf-healthy-check.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
 STATUS=0
-NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-NOT_FOUND=`ldd /openair-amf/bin/oai_amf | grep -c "not found" || true`
-if [[ $NB_UNREPLACED_AT -ne 0 || $NOT_FOUND -ne 0 ]]
-then
-  STATUS=-1
+
+RESULT=$(ps aux | grep -v nohup || true)
+SUB='/openair-amf/bin/oai_amf -c /openair-amf/etc/amf.conf -o'
+if [[ $RESULT =~ $SUB ]]; then
+    STATUS=0
+else
+   STATUS=-1
 fi
 
 exit $STATUS
+
+
diff --git a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
index 6ab0e120879c082bd87062cd7af4c8ed90b43c6b..3af23cad873a73083a46cf787395176e7b6cb817 100644
--- a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
+++ b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
@@ -155,15 +155,20 @@ services:
             - AMF_IPV4_ADDRESS=192.168.61.196
             - AMF_PORT=80
             - AMF_API_VERSION=v1
+            - AMF_FQDN=cicd_oai_amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
             - UDM_API_VERSION=v1
+            - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.61.198
+            - UPF_FQDN_0=cicd_oai_upf
             - NRF_IPV4_ADDRESS=192.168.61.195
             - NRF_PORT=80
             - NRF_API_VERSION=v1
+            - NRF_FQDN=cicd_oai_nrf
             - REGISTER_NRF=yes
             - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
         depends_on:
             - cicd_oai_nrf
             - cicd_oai_amf
diff --git a/ci-scripts/dsTesterDockerCompose/nrf-healthy-check.sh b/ci-scripts/dsTesterDockerCompose/nrf-healthy-check.sh
index 3e18ed44fd33853a036365b8c9a474e63f5f3b0a..66ba809316bffe544f7003b908802406b5c69f15 100755
--- a/ci-scripts/dsTesterDockerCompose/nrf-healthy-check.sh
+++ b/ci-scripts/dsTesterDockerCompose/nrf-healthy-check.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
 STATUS=0
-NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-NOT_FOUND=`ldd /openair-nrf/bin/oai_nrf | grep -c "not found" || true`
-if [[ $NB_UNREPLACED_AT -ne 0 || $NOT_FOUND -ne 0 ]]
-then
-  STATUS=-1
+
+RESULT=$(ps aux | grep -v nohup || true)
+SUB='/openair-nrf/bin/oai_nrf -c /openair-nrf/etc/nrf.conf -o'
+if [[ $RESULT =~ $SUB ]]; then
+    STATUS=0
+else
+   STATUS=-1
 fi
 
 exit $STATUS
+
+
diff --git a/ci-scripts/dsTesterDockerCompose/smf-healthy-check.sh b/ci-scripts/dsTesterDockerCompose/smf-healthy-check.sh
index 7298b14c862b7afeb8e859f70d1d6dcdca9fd5bf..924d1d950dc2c565e68094046b9a83d4d26a4f13 100755
--- a/ci-scripts/dsTesterDockerCompose/smf-healthy-check.sh
+++ b/ci-scripts/dsTesterDockerCompose/smf-healthy-check.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 STATUS=0
-NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-NOT_FOUND=`ldd /openair-smf/bin/oai_smf | grep -c "not found" || true`
-if [[ $NB_UNREPLACED_AT -ne 0 || $NOT_FOUND -ne 0 ]]
-then
-  STATUS=-1
+
+RESULT=$(ps aux | grep -v nohup || true)
+SUB='/openair-smf/bin/oai_smf -c /openair-smf/etc/smf.conf -o'
+if [[ $RESULT =~ $SUB ]]; then
+    STATUS=0
+else
+   STATUS=-1
 fi
 
 exit $STATUS
diff --git a/ci-scripts/dsTesterDockerCompose/upf-healthy-check.sh b/ci-scripts/dsTesterDockerCompose/upf-healthy-check.sh
index f53ec204f98ebf77db9b34c7c2e357aa61ef27e9..69a8fa4759cb69e3a703a2685c958b734b78c31f 100755
--- a/ci-scripts/dsTesterDockerCompose/upf-healthy-check.sh
+++ b/ci-scripts/dsTesterDockerCompose/upf-healthy-check.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 STATUS=0
-NB_UNREPLACED_AT=`cat /openair-spgwc/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-NOT_FOUND=`ldd /openair-spgwu-tiny/bin/oai_spgwu | grep -c "not found" || true`
-if [[ $NB_UNREPLACED_AT -ne 0 || $NOT_FOUND -ne 0 ]]
-then    
-  STATUS=-1
+
+RESULT=$(ps aux | grep -v nohup || true)
+SUB='/openair-spgwu-tiny/bin/oai_spgwu -c /openair-spgwu-tiny/etc/spgw_u.conf -o'
+if [[ $RESULT =~ $SUB ]]; then
+    STATUS=0
+else
+   STATUS=-1
 fi
 
 exit $STATUS