diff --git a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
index 7df2b5c183..9d3dd113e4 100644
--- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
@@ -186,10 +186,9 @@ services:
         network_mode: "host"
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --MACRLCs.[0].scheduler_mode "default" --log_config.global_log_options level,nocolor,time
         volumes:
-          - ../../conf_files/enb.band7.25prb.l2sim.conf:/opt/oai-enb/etc/mounted.conf
+          - ../../conf_files/enb.band7.25prb.l2sim.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -219,11 +218,10 @@ services:
         network_mode: "host"
         environment:
             TZ: Europe/Paris
-            USE_NFAPI: 'yes'
             OPENAIR_DIR: /opt/oai-nr-ue
             USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 2 --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/mounted.conf
+            - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/ue.conf
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
             - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
         healthcheck:
@@ -239,11 +237,10 @@ services:
         network_mode: "host"
         environment:
             TZ: Europe/Paris
-            USE_NFAPI: 'yes'
             OPENAIR_DIR: /opt/oai-nr-ue
             USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 3 --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/mounted.conf
+            - ../../conf_files/lteue.band7.25prb.l2sim.conf:/opt/oai-lte-ue/etc/ue.conf
             - ../../conf_files/lte-ue.usim.conf:/opt/oai-lte-ue/etc/ue_usim.conf
             - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
         healthcheck:
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
index 32a56d8319..ca005e9568 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
@@ -189,10 +189,9 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: enb
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -211,7 +210,6 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: 192.168.61.20
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
index e9e858e161..4361409488 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
@@ -11,10 +11,9 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: enb
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1
         volumes:
-            - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -33,7 +32,6 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: 192.168.61.20
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
index 18640a3670..1ba0178949 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
@@ -188,11 +188,10 @@ services:
                 ipv4_address: 192.168.61.20
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             RFSIMULATOR: enb
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/enb.band7.50prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.50prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -211,7 +210,6 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: 192.168.61.20
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
         volumes: 
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
index ef21c87559..edde78480e 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
@@ -188,11 +188,10 @@ services:
                 ipv4_address: 192.168.61.20
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             RFSIMULATOR: enb
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         volumes: 
-            - ../../conf_files/enb.band7.100prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.100prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -211,7 +210,6 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: 192.168.61.20
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
index c3b3a9b187..3efc61505f 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
@@ -10,11 +10,10 @@ services:
                 ipv4_address: 192.168.61.20
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             RFSIMULATOR: enb
             USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/enb.band7.25prb.rfsim-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.rfsim-tm1.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -30,7 +29,6 @@ services:
                 ipv4_address: 192.168.61.30
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             RFSIMULATOR: 192.168.61.20
             USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
index fddacbe7cc..66ae5877e1 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
@@ -10,11 +10,10 @@ services:
                 ipv4_address: 192.168.61.20
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             RFSIMULATOR: enb
             USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/enb.band7.25prb.rfsim-tm1-mbms.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.rfsim-tm1-mbms.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -36,7 +35,6 @@ services:
             TZ: Europe/Paris
             HOSTNAME: oai_ue0
             RFSIMULATOR: 192.168.61.20
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
index c0f9fd7403..18ab587731 100644
--- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
@@ -188,11 +188,10 @@ services:
                 ipv4_address: 192.168.61.20
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             RFSIMULATOR: enb
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/enb.band38.25prb.rfsim.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band38.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
             interval: 10s
@@ -211,7 +210,6 @@ services:
         environment:
             TZ: Europe/Paris
             RFSIMULATOR: 192.168.61.20
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
index 602f0bdff8..dd2a1b2cdd 100644
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-cu
         environment: 
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -176,7 +175,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-          - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/mounted.conf
+          - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -188,7 +187,6 @@ services:
         container_name: rfsim5g-oai-du
         environment: 
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-cu
@@ -196,7 +194,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.142
         volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -208,7 +206,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment: 
             RFSIMULATOR: 192.168.71.142
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-du
@@ -216,7 +213,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.150
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
index 94f6e40dda..e3fb278b33 100644
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment: 
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -176,7 +175,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band66.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band66.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -188,7 +187,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment: 
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -196,7 +194,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.150
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
index e666e44eac..db77cdae53 100644
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -169,13 +169,12 @@ services:
         network_mode: "host"
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
         depends_on:
             - oai-spgwu
             - oai-amf
         volumes:
-            - ../../conf_files/gnb.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -205,11 +204,10 @@ services:
         network_mode: "host"
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             OPENAIR_DIR: /opt/oai-nr-ue
             USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
         volumes:
-            - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
         depends_on:
             - oai-gnb
diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
index 37b0fca691..e4129adee2 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -176,7 +175,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -188,7 +187,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment: 
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -196,7 +194,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.150
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
@@ -209,7 +207,6 @@ services:
         container_name: rfsim5g-oai-nr-ue2
         environment: 
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -217,7 +214,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.151
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
index 9c987000be..3b62c00ab5 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -176,7 +175,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -188,7 +187,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -196,7 +194,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.150
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
index 2f63ffe9d5..4d3e8b7dde 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -176,7 +175,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -189,7 +188,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -198,7 +196,7 @@ services:
                 ipv4_address: 192.168.71.150
         volumes:
             - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml
index a56efa89d8..e43bc0e0d9 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml
@@ -7,10 +7,9 @@ services:
         network_mode: "host"
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --MACRLCs.[0].local_n_address 172.21.16.109 --MACRLCs.[0].remote_n_address 172.21.6.22 --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
index 2f09bb4a9a..b44822b3e8 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -169,7 +169,6 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cucp
         environment:
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -179,7 +178,7 @@ services:
             ran_net:
                 ipv4_address: 192.168.72.140
         volumes:
-            - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -191,7 +190,6 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cuup
         environment:
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim
             #--log_config.global_log_options level,nocolor,time
         depends_on:
@@ -202,7 +200,7 @@ services:
             ran_net:
                 ipv4_address: 192.168.72.141
         volumes:
-            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
             interval: 10s
@@ -215,13 +213,12 @@ services:
         container_name: rfsim5g-oai-du
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         networks:
             ran_net:
                 ipv4_address: 192.168.72.142
         volumes:
-            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
index 78f42babc7..b654f06d12 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
@@ -6,13 +6,12 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.band66.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.band66.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf
             - rrc.config:/opt/oai-gnb/
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
@@ -26,10 +25,9 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/
         depends_on:
             - oai-gnb
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
index 019c9cf794..eef67d713b 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
@@ -6,13 +6,12 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf
             - rrc.config:/opt/oai-gnb/
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
@@ -26,10 +25,9 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time 
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/
         depends_on:
             - oai-gnb
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
index 8e5398529f..ed2af44fbb 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
@@ -6,13 +6,12 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/gnb.conf
             - rrc.config:/opt/oai-gnb/
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
@@ -26,10 +25,9 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/
         depends_on:
             - oai-gnb
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
index f6c945aafa..89c737ba06 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             RFSIMULATOR: server
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-ext-dn
@@ -176,7 +175,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band66.u0.25prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band66.u0.25prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -189,7 +188,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             RFSIMULATOR: 192.168.71.140
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
@@ -197,7 +195,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.150
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/mounted.conf
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml
index 9b27fb41c0..3656f6b00f 100644
--- a/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml
+++ b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: prod-enb-mono-fdd
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].max_pdschReferenceSignalPower -27 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --log_config.global_log_options level,nocolor,time
         volumes:
-            - ../../conf_files/enb.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf
         networks:
             public_net:
                 ipv4_address: 192.168.61.30
diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml
index 47ee5798a9..8307ec4f34 100644
--- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml
index 63abc5bd28..b306920833 100644
--- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml
index f6cb2feb3e..7e2bdfbe8b 100644
--- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml
index a4f30aba44..0613025571 100644
--- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.50prb.usrpb200-tm1-cdrx.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml
index 4d31745e7b..58dc034d1e 100644
--- a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-fdd-20Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml
index 2a221ebe82..7d0a1a87af 100644
--- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-tdd-05Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml
index 49e13b3817..44c61d8787 100644
--- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml
@@ -7,11 +7,10 @@ services:
         container_name: lte-b200-enb-tdd-05Mhz-tm2
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --log_config.global_log_options level,nocolor,time,line_num,function
             #USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 --eNBs.[0].component_carriers.[0].nb_antenna_ports 2 --eNBs.[0].component_carriers.[0].nb_antennas_tx 2 --eNBs.[0].component_carriers.[0].nb_antennas_rx 2 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band40.25prb.usrpb200-tm2.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band40.25prb.usrpb200-tm2.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml
index 9f00ec4737..0a103b8c21 100644
--- a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-tdd-10Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].N_RB_DL 50 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml
index c891b9ab2c..9e0ed337a0 100644
--- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-tdd-20Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --eNBs.[0].component_carriers.[0].N_RB_DL 100 --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band40.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml
index 5d53e8ca83..138f2088d9 100644
--- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: lte-b200-enb-tdd-20Mhz-tm1
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         network_mode: "host"
         healthcheck:
diff --git a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
index abd2c7d40e..9655cca180 100644
--- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
@@ -6,10 +6,9 @@ services:
         container_name: oai-enb
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6
         volumes:
-            - ../../conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf:/opt/oai-enb/etc/enb.conf
         network_mode: "host"
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
diff --git a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
index 1679b632b6..84711b0a3c 100644
--- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
@@ -6,10 +6,9 @@ services:
         container_name: oai-enb
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6
         volumes:
-            - ../../conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf:/opt/oai-enb/etc/enb.conf
         network_mode: "host"
         healthcheck:
             test: /bin/bash -c "pgrep lte-softmodem"
diff --git a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
index 8c2171c0f2..f6e7214659 100644
--- a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: nsa-b200-enb
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/enb.nsa.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/mounted.conf
+            - ../../conf_files/enb.nsa.band7.25prb.usrpb200.conf:/opt/oai-enb/etc/enb.conf
             - /dev:/dev
         networks:
             public_net:
diff --git a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
index 50d1c70399..67d240d796 100644
--- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: nsa-b200-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev
         networks:
             public_net:
diff --git a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
index 7468df5e62..d3875aa5bc 100644
--- a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: oai-gnb-aw2s
         environment:
             TZ: Europe/Paris
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa
         volumes:
-            - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf:/opt/oai-gnb-aw2s/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf:/opt/oai-gnb-aw2s/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
diff --git a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
index 1cad790816..f46d7b1b0a 100644
--- a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: sa-b200-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev
         networks:
             public_net:
diff --git a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
index e868faedd8..d5396e4933 100644
--- a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
@@ -7,10 +7,9 @@ services:
         container_name: sa-cu-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev
         networks:
             public_net:
@@ -29,10 +28,9 @@ services:
         container_name: sa-du-b200-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_VOLUMED_CONF: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 14 --RUs.[0].att_tx 14
         volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/mounted.conf
+            - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev
         networks:
             public_net:
diff --git a/docker/README.md b/docker/README.md
index 18f955b760..5e71332d4a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -174,12 +174,11 @@ services:
         privileged: true
         container_name: sa-b200-gnb
         environment:
-            USE_VOLUMED_CONF: 'yes'
             USE_B2XX: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa -E --continuous-tx
         volumes:
             - /dev:/dev
-            - /tmp/gnb.conf:/opt/oai-gnb/etc/mounted.conf
+            - /tmp/gnb.conf:/opt/oai-gnb/etc/gnb.conf
         networks:
             public_net:
                 ipv4_address: 192.168.68.194
diff --git a/docker/scripts/enb_entrypoint.sh b/docker/scripts/enb_entrypoint.sh
index 28038ab36d..aadd8b71d1 100755
--- a/docker/scripts/enb_entrypoint.sh
+++ b/docker/scripts/enb_entrypoint.sh
@@ -5,14 +5,6 @@ set -uo pipefail
 PREFIX=/opt/oai-enb
 CONFIGFILE=$PREFIX/etc/enb.conf
 
-if [[ -v USE_VOLUMED_CONF ]]; then
-  cp $PREFIX/etc/mounted.conf $PREFIX/etc/enb.conf
-else
-  echo "ERROR: No configuration file provided."
-  echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf"
-  exit 1
-fi
-
 if [ ! -f $CONFIGFILE ]; then
   echo "No configuration file found: please mount at $CONFIGFILE"
   exit 255
diff --git a/docker/scripts/gnb-aw2s_entrypoint.sh b/docker/scripts/gnb-aw2s_entrypoint.sh
index 5318a1e6a3..b03e214ce1 100755
--- a/docker/scripts/gnb-aw2s_entrypoint.sh
+++ b/docker/scripts/gnb-aw2s_entrypoint.sh
@@ -5,14 +5,6 @@ set -uo pipefail
 PREFIX=/opt/oai-gnb-aw2s
 CONFIGFILE=$PREFIX/etc/gnb.conf
 
-if [[ -v USE_VOLUMED_CONF ]]; then
-  cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf
-else
-  echo "ERROR: No configuration file provided."
-  echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf"
-  exit 1
-fi
-
 if [ ! -f $CONFIGFILE ]; then
   echo "No configuration file found: please mount at $CONFIGFILE"
   exit 255
diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh
index fdef130db7..ef268b1143 100755
--- a/docker/scripts/gnb_entrypoint.sh
+++ b/docker/scripts/gnb_entrypoint.sh
@@ -5,11 +5,6 @@ set -uo pipefail
 PREFIX=/opt/oai-gnb
 CONFIGFILE=$PREFIX/etc/gnb.conf
 
-if [[ -v USE_VOLUMED_CONF ]]; then
-  cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf
-else
-  echo "Using default configuration"
-fi
 
 if [ ! -f $CONFIGFILE ]; then
   echo "No configuration file found: please mount at $CONFIGFILE"
diff --git a/docker/scripts/lte_ru_entrypoint.sh b/docker/scripts/lte_ru_entrypoint.sh
index ae3d411409..4ce5615482 100755
--- a/docker/scripts/lte_ru_entrypoint.sh
+++ b/docker/scripts/lte_ru_entrypoint.sh
@@ -5,15 +5,6 @@ set -uo pipefail
 PREFIX=/opt/oai-lte-ru
 CONFIGFILE=$PREFIX/etc/rru.conf
 
-# Based another env var, pick one template to use
-if [[ -v USE_VOLUMED_CONF ]]; then
-  cp $PREFIX/etc/rru.fdd.conf $PREFIX/etc/rru.conf
-else
-  echo "ERROR: No configuration file provided."
-  echo "Please set USE_VOLUMED_CONF and mount a configuration file at $PREFIX/etc/mounted.conf"
-  exit 1
-fi
-
 if [ ! -f $CONFIGFILE ]; then
   echo "No configuration file found: please mount at $CONFIGFILE"
   exit 255
diff --git a/docker/scripts/lte_ue_entrypoint.sh b/docker/scripts/lte_ue_entrypoint.sh
index 7b271a2437..74c76ed5ac 100755
--- a/docker/scripts/lte_ue_entrypoint.sh
+++ b/docker/scripts/lte_ue_entrypoint.sh
@@ -14,38 +14,6 @@ echo "=================================="
 echo "== Configuration file:"
 cat $CONFIGFILE
 
-# Based another env var, pick one template to use
-if [[ -v USE_NFAPI ]]; then cp $PREFIX/etc/ue.nfapi.conf $PREFIX/etc/ue.conf; fi
-
-# Only this template will be manipulated and the USIM one!
-CONFIG_FILES=`ls $PREFIX/etc/ue.conf $PREFIX/etc/ue_usim.conf || true`
-
-for c in ${CONFIG_FILES}; do
-    # grep variable names (format: ${VAR}) from template to be rendered
-    VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs)
-
-    # create sed expressions for substituting each occurrence of ${VAR}
-    # with the value of the environment variable "VAR"
-    EXPRESSIONS=""
-    for v in ${VARS}; do
-        NEW_VAR=`echo $v | sed -e "s#@##g"`
-        if [[ "${!NEW_VAR}x" == "x" ]]; then
-            echo "Error: Environment variable '${NEW_VAR}' is not set." \
-                "Config file '$(basename $c)' requires all of $VARS."
-            exit 1
-        fi
-        EXPRESSIONS="${EXPRESSIONS};s|${v}|${!NEW_VAR}|g"
-    done
-    EXPRESSIONS="${EXPRESSIONS#';'}"
-
-    # render template and inline replace config file
-    sed -i "${EXPRESSIONS}" ${c}
-
-    echo "=================================="
-    echo "== Configuration file: ${c}"
-    cat ${c}
-done
-
 #now generate USIM files
 # At this point all operations will be run from $PREFIX!
 cd $PREFIX
@@ -68,7 +36,8 @@ while [[ $# -gt 0 ]]; do
   new_args+=("$1")
   shift
 done
-if [[ -v USE_NFAPI ]]; then
+FILE=$PREFIX/etc/ue.conf
+if [[ -f "$FILE"  ]]; then
   new_args+=("-O")
   new_args+=("$PREFIX/etc/ue.conf")
 fi
diff --git a/docker/scripts/nr_ue_entrypoint.sh b/docker/scripts/nr_ue_entrypoint.sh
index 11bc7f907e..840a8ae729 100755
--- a/docker/scripts/nr_ue_entrypoint.sh
+++ b/docker/scripts/nr_ue_entrypoint.sh
@@ -5,12 +5,6 @@ set -uo pipefail
 PREFIX=/opt/oai-nr-ue
 CONFIGFILE=$PREFIX/etc/nr-ue.conf
 
-if [[ -v USE_VOLUMED_CONF ]]; then
-  cp $PREFIX/etc/mounted.conf $PREFIX/etc/nr-ue.conf
-else
-  echo "Using default configuration"
-fi
-
 if [ ! -f $CONFIGFILE ]; then
   echo "No configuration file found: please mount at $CONFIGFILE"
   exit 255