diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf
index 02db4c22f9..7f62777b0e 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf
@@ -14,7 +14,7 @@ eNBs =
     cell_type       =  "CELL_MACRO_ENB";
     eNB_name        =  "eNB_Eurecom_0";
     // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  "1";
+    tracking_area_code  =  "15";
     mobile_country_code =  "208";
     mobile_network_code =  "92";
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
index 764fc7d4c5..e9dda2fc6f 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
@@ -52,7 +52,7 @@ MME :
         # MME code DEFAULT = 0
         # size = 8 bits
         # maximum of 256 values, comma separated
-        MME_CODE = [ 30 , 31, 32, 33, 34, 35, 36, 56 , 1 , 8 ];
+        MME_CODE = [ 29, 30 , 31, 32, 33, 34, 35, 36, 56 , 1 , 8 ];
 
         # MME GROUP ID DEFAULT = 0
         # size = 16 bits
@@ -63,7 +63,7 @@ MME :
         # max values = 999.999:65535
         # maximum of 32 values, comma separated
         PLMN = ( 
-             {MCC="208" ; MNC="92";  TAC = "1"; },
+             {MCC="208" ; MNC="92";  TAC = "15"; },
              {MCC="208" ; MNC="10";  TAC = "1"; },
              {MCC="209" ; MNC="130"; TAC = "4"; },
              {MCC="209" ; MNC="012"; TAC = "2"; },
@@ -75,7 +75,7 @@ MME :
     {
         # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
         # decreasing preference goes from left to right
-        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA0" , "EIA1" , "EIA2" ];
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" , "EIA0" ];
         ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
     };
     
@@ -118,7 +118,7 @@ P-GW =
     IP_ADDRESS_POOL :
     {
         IPV4_LIST = (
-                      "192.168.87.32",
+                      "192.168.2.60",
                       "192.168.88.0/24",
                       "192.168.90.0/24"
                     );