Modify all YAML files to work with .env files from DeployObject()

ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: l2sim4g-oai-enb
         network_mode: "host"
@@ -210,7 +210,7 @@ services:
             retries: 5
 
     oai_ue1:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: l2sim4g-oai-lte-ue1
         network_mode: "host"
@@ -229,7 +229,7 @@ services:
             retries: 5
 
     oai_ue2:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: l2sim4g-oai-lte-ue2
         network_mode: "host"

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -196,7 +196,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

 services:
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -18,7 +18,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -196,7 +196,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -196,7 +196,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml

 services:
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -18,7 +18,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml

 services:
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -18,7 +18,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -178,7 +178,7 @@ services:
             retries: 5
 
     oai_enb0:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-enb
         networks:
@@ -196,7 +196,7 @@ services:
             retries: 5
 
     oai_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: rfsim4g-oai-lte-ue0
         networks:

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -83,7 +83,7 @@ services:
             retries: 5
 
     oai-cu:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-cu
         cap_drop:
             - ALL
@@ -104,7 +104,7 @@ services:
             retries: 5
 
     oai-du:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du
         cap_drop:
             - ALL
@@ -129,7 +129,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -101,7 +101,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: "l2sim-oai-gnb"
         cap_drop:
             - ALL
@@ -119,7 +119,7 @@ services:
             retries: 5
 
     oai-nr-ue0:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: "l2sim-oai-nr-ue0"
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -101,7 +101,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL
@@ -125,7 +125,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue2
         cap_drop:
             - ALL
@@ -149,7 +149,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue3
         cap_drop:
             - ALL
@@ -173,7 +173,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue4:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue4
         cap_drop:
             - ALL
@@ -197,7 +197,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue5:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue5
         cap_drop:
             - ALL
@@ -221,7 +221,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue6:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue6
         cap_drop:
             - ALL
@@ -245,7 +245,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue7:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue7
         cap_drop:
             - ALL
@@ -269,7 +269,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue8:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue8
         cap_drop:
             - ALL
@@ -293,7 +293,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue9:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue9
         cap_drop:
             - ALL
@@ -317,7 +317,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue10:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue10
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -101,7 +101,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml

 services:
     oai-du:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du
         cap_drop:
             - ALL
@@ -15,7 +15,7 @@ services:
             timeout: 5s
             retries: 5
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml

@@ -65,7 +65,7 @@ services:
                 ipv4_address: 192.168.72.134
 
     oai-cucp:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-cucp
         cap_drop:
             - ALL
@@ -92,7 +92,7 @@ services:
             retries: 5
 
     oai-cuup:
-        image: oaisoftwarealliance/oai-nr-cuup:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup
         cap_drop:
             - ALL
@@ -121,7 +121,7 @@ services:
             retries: 5
 
     oai-cuup2:
-        image: oaisoftwarealliance/oai-nr-cuup:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup2
         cap_drop:
             - ALL
@@ -153,7 +153,7 @@ services:
             retries: 5
 
     oai-cuup3:
-        image: oaisoftwarealliance/oai-nr-cuup:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: rfsim5g-oai-cuup3
         cap_drop:
             - ALL
@@ -185,7 +185,7 @@ services:
             retries: 5
 
     oai-du:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du
         cap_drop:
             - ALL
@@ -214,7 +214,7 @@ services:
             retries: 5
 
     oai-du2:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du2
         cap_drop:
             - ALL
@@ -246,7 +246,7 @@ services:
             retries: 5
 
     oai-du3:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-du3
         cap_drop:
             - ALL
@@ -278,7 +278,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL
@@ -306,7 +306,7 @@ services:
             retries: 5
 
     oai-nr-ue2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue2
         cap_drop:
             - ALL
@@ -334,7 +334,7 @@ services:
             retries: 5
 
     oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue3
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml

@@ -82,7 +82,7 @@ services:
             retries: 5
 
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -101,7 +101,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml

 services:
     oai-nr-ue-1:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue-1
         cap_drop:
             - ALL
@@ -23,7 +23,7 @@ services:
             retries: 5
 
     oai-nr-ue-2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue-2
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
             timeout: 5s
             retries: 5
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL

ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml

 services:
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         network_mode: host
         container_name: oai-nr-ue
         cap_drop:

ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: prod-enb-mono-fdd
         environment:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml

 services:
     rru_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-rru-fdd-05Mhz-tm1
         network_mode: "host"
@@ -17,7 +17,7 @@ services:
             timeout: 5s
             retries: 5
     rcc_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-rcc-fdd-05Mhz-tm1
         network_mode: "host"

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml

 services:
     lte_ue0:
-        image: oaisoftwarealliance/oai-lte-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
         privileged: true
         container_name: lte-b200-ue-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-fdd-20Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml

 services:
     rru_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-rru-tdd-05Mhz-tm1
         network_mode: "host"
@@ -17,7 +17,7 @@ services:
             timeout: 5s
             retries: 5
     rcc_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-rcc-tdd-05Mhz-tm1
         network_mode: "host"

ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-tdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-tdd-05Mhz-tm2
         environment:

ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-tdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-tdd-20Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: lte-b200-enb-tdd-20Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml

 services:
     oai-enb:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: oai-enb
         environment:

ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml

 services:
     oai-enb:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: oai-enb
         environment:

ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oaisoftwarealliance/oai-enb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
         privileged: true
         container_name: nsa-b200-enb
         ulimits:

ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml

 services:
     gnb_mono_tdd:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: nsa-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb-aw2s:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aw2s:${TAG:-develop}
         network_mode: "host"
         container_name: oai-gnb-aw2s
         cap_drop:

ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml

 services:
     gnb_mono_tdd:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: sa-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml

 services:
     gnb_cucp:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: sa-cucp-gnb
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     gnb_cuup:
-        image: oaisoftwarealliance/oai-nr-cuup:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
         container_name: sa-cuup-gnb
         cap_drop:
             - ALL
@@ -52,7 +52,7 @@ services:
             retries: 5
 
     gnb_du_tdd:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: sa-du-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml

 services:
     gnb_cu:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: sa-cu-gnb
         cap_drop:
             - ALL
@@ -26,7 +26,7 @@ services:
             retries: 5
 
     gnb_du_fdd:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: sa-du-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb-fhi72:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop}
         cap_add:
             - SYS_ADMIN
             - IPC_LOCK

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb-fhi72:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop}
         cap_add:
             - SYS_ADMIN
             - IPC_LOCK

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -34,7 +34,7 @@ services:
       retries: 5
   oai-gnb-aerial:
     cpuset: "13-20"
-    image: oaisoftwarealliance/oai-gnb-aerial:develop
+    image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aerial:${TAG:-develop}
     depends_on:
       nv-cubb:
         condition: service_healthy

ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml

 services:
     gnb_mono_tdd:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: sa-b200-gnb
         cap_drop:
             - ALL