diff --git a/openair-cn/UTILS/CONF/epc_caviar.conf b/openair-cn/UTILS/CONF/epc_caviar.conf
index d229618d30dc6cc4846bed06c4126dd8b195d981..55f87e57e32d658fa56a3d8b2eb7f1b90d38f789 100644
--- a/openair-cn/UTILS/CONF/epc_caviar.conf
+++ b/openair-cn/UTILS/CONF/epc_caviar.conf
@@ -41,7 +41,7 @@ MME_GID = 3,4,5,30,8,9,50021;
 # TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
 # max values = 999.999:65535
 # maximum of 32 values, comma separated
-PLMN = 208.38:0,209.130:4,208.92:0;
+PLMN = 208.38:0,209.130:4,208.92:1;
 
 # ------- Interfaces definitions
 SGW_INTERFACE_NAME_FOR_S11            = "eth0";
diff --git a/openair-cn/UTILS/CONF/epc_sud.conf b/openair-cn/UTILS/CONF/epc_sud.conf
index 072bc1c3fa554ee06c42831732a2cdb5df632cc4..8af6a389d19ed23ff93606f7b5a4747ee18677f0 100644
--- a/openair-cn/UTILS/CONF/epc_sud.conf
+++ b/openair-cn/UTILS/CONF/epc_sud.conf
@@ -41,7 +41,7 @@ MME_GID = 3,4,5,30,8,9,50021;
 # TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
 # max values = 999.999:65535
 # maximum of 32 values, comma separated
-PLMN = 208.38:0,209.130:4,208.92:0,208.10:0;
+PLMN = 208.38:0,209.130:4,208.92:1,208.10:1;
 
 # ------- Interfaces definitions
 SGW_INTERFACE_NAME_FOR_S11            = "eth0";
diff --git a/openair-cn/UTILS/CONF/epc_tapenade.conf b/openair-cn/UTILS/CONF/epc_tapenade.conf
index 67881390ab6a1ffeb1b5e7b979167bb52fed7892..76162a4f3229995f84d8fd8223bfa4ba1b2b2727 100644
--- a/openair-cn/UTILS/CONF/epc_tapenade.conf
+++ b/openair-cn/UTILS/CONF/epc_tapenade.conf
@@ -41,7 +41,7 @@ MME_GID = 3,4,5,30,8,9,50021;
 # TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
 # max values = 999.999:65535
 # maximum of 32 values, comma separated
-PLMN = 208.38:0,209.130:4,208.92:0;
+PLMN = 208.38:0,209.130:4,208.92:1,208.10:1;
 
 # ------- Interfaces definitions
 SGW_INTERFACE_NAME_FOR_S11            = "eth0";
diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index 24e5704534ffbaee06bbe1eaf5fbe66505028828..3832bb6a04cacdd971603802d7c640a91ff33b15 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -109,12 +109,12 @@ static Enb_properties_t enb_0_properties =
     347472,
     CELL_MACRO_ENB,
     "eNB_Eurecom_0",
-    0,
-    208,
+    1,      /* Tracking area code, 0x0000 and 0xfffe are reserved values */
+    208,    /* Mobile Country Code */
 #ifdef EXMIMO_IOT
-    92,
+    92,     /* Mobile Network Code */
 #else
-    10,
+    10,     /* Mobile Network Code */
 #endif
     PAGING_DRX_256,
     1, /* There are 2 addresses defined, but use only one by default */
@@ -140,7 +140,7 @@ static Enb_properties_t enb_1_properties =
     347473,
     CELL_MACRO_ENB,
     "eNB_Eurecom_1",
-    0,
+    1,
     208,
     92,
     PAGING_DRX_256,
@@ -167,7 +167,7 @@ static Enb_properties_t enb_2_properties =
     347474,
     CELL_MACRO_ENB,
     "eNB_Eurecom_2",
-    0,
+    1,
     208,
     92,
     PAGING_DRX_256,
@@ -188,7 +188,7 @@ static Enb_properties_t enb_3_properties =
     347475,
     CELL_MACRO_ENB,
     "eNB_Eurecom_3",
-    0,
+    1,
     208,
     92,
     PAGING_DRX_256,