diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh
index 4e8983599e26e6eb21db247e0d6a0de17ff86f7a..c9c541510543d76800f6542a9406f673cd2dbe1b 100755
--- a/docker/scripts/gnb_entrypoint.sh
+++ b/docker/scripts/gnb_entrypoint.sh
@@ -11,6 +11,7 @@ THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD}
 if [[ -v USE_NSA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.nsa.tdd.conf $PREFIX/etc/gnb.conf; fi
 if [[ -v USE_SA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi
 if [[ -v USE_SA_TDD_MONO_B2XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.b2xx.conf $PREFIX/etc/gnb.conf; fi
+if [[ -v USE_SA_TDD_MONO_X3XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi
 if [[ -v USE_SA_FDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.fdd.conf $PREFIX/etc/gnb.conf; fi
 if [[ -v USE_SA_CU ]]; then cp $PREFIX/etc/gnb.sa.cu.conf $PREFIX/etc/gnb.conf; fi
 if [[ -v USE_SA_TDD_CU ]]; then cp $PREFIX/etc/gnb.sa.du.tdd.conf $PREFIX/etc/gnb.conf; fi
@@ -18,8 +19,12 @@ if [[ -v USE_SA_NFAPI_VNF ]]; then cp $PREFIX/etc/gnb.sa.nfapi.vnf.conf $PREFIX/
 # Sometimes, the templates are not enough. We mount a conf file on $PREFIX/etc. It can be a template itself.
 if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf; fi
 
-# Resolve AMF FQDN
+# Defualt Parameters
+GNB_ID=${GNB_ID:-0xe00}
+USE_FQDN=${USE_FQDN:-false}
 AMF_FQDN=${AMF_FQDN:-oai-amf-svc}
+
+# Resolve AMF FQDN
 if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi
 
 # Only this template will be manipulated
diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml
index a7539daa69f1b345af0a4057454fa8ac8eee6d2d..a1a03c14235d4cdd1e60a23c947f3d54a993f00e 100644
--- a/docker/scripts/gnb_parameters.yaml
+++ b/docker/scripts/gnb_parameters.yaml
@@ -28,6 +28,8 @@
   - filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf
     outputfilename: "gnb.nsa.tdd.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name
@@ -72,6 +74,8 @@
   - filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf
     outputfilename: "gnb.sa.tdd.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name
@@ -104,6 +108,8 @@
   - filePrefix: gnb.sa.band78.fr1.106PRB.usrpb210.conf
     outputfilename: "gnb.sa.tdd.b2xx.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name
@@ -134,6 +140,8 @@
   - filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf
     outputfilename: "gnb.sa.fdd.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name
@@ -166,6 +174,8 @@
   - filePrefix: gNB_SA_CU.conf
     outputfilename: "gnb.sa.cu.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name
@@ -206,6 +216,8 @@
   - filePrefix: gNB_SA_DU.conf
     outputfilename: "gnb.sa.du.tdd.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name
@@ -248,6 +260,8 @@
   - filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
     outputfilename: "gnb.sa.nfapi.vnf.conf"
     config:
+    - key: GNB_ID
+      env: "@GNB_ID@" 
     - key: Active_gNBs
       env: "@GNB_NAME@"
     - key: gNB_name