diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/enb.calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/enb.calisson.conf
index 586b843be62c7d8dd6be6271ce038577634adbbe..3c5d0f1898b3e6bdf8b8511986dca4c586f17792 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/enb.calisson.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/enb.calisson.conf
@@ -9,7 +9,7 @@ eNBs =
  {
     ////////// Identification parameters:
     # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "hard";
+    real_time       =  "rt-preempt";
     eNB_ID          =  0xe00;
     cell_type       =  "CELL_MACRO_ENB";
     eNB_name        =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/epc.mme0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/epc.mme0.conf
index a1b526781579b7dc0a0ea35f019eb5aa6764787e..7d4672fc1d532ddfdeb9ec9df225fc893fc4543c 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/epc.mme0.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB.VM_MME.VM_HSS/epc.mme0.conf
@@ -186,8 +186,8 @@ P-GW =
         PGW_INTERFACE_NAME_FOR_S5_S8          = "none";
         PGW_IPV4_ADDRESS_FOR_S5_S8            = "0.0.0.0/24";
 
-        PGW_INTERFACE_NAME_FOR_SGI            = "none";
-        PGW_IPV4_ADDRESS_FOR_SGI              = "0.0.0.0/24";
+        PGW_INTERFACE_NAME_FOR_SGI            = "eth0";
+        PGW_IPV4_ADDRESS_FOR_SGI              = "192.168.14.178/24";
     };
     
     IP_ADDRESS_POOL :
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf
index b4128c49b6bf01fe5448c1a1184bff16969e1f6c..4b53abff1f959e9d80ec32b7f41268ad7e50ad04 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf
@@ -121,7 +121,6 @@ eNBs =
     {
         ENB_INTERFACE_NAME_FOR_S1_MME            = "lo";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "127.0.0.1/24";
-        ENB_PORT_FOR_S1_MME                      = 36512; # Spec 36412
 
         ENB_INTERFACE_NAME_FOR_S1U               = "lo";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.1/24";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.conf
index 4636c38bf66be68f9034d8d7e7a84c48b19770a7..7ce3429b2f7121e18cf1c310d7b79e276695e059 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.conf
@@ -116,6 +116,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
     log_config : 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band39.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band39.conf
index 43201d970794e4ac25b1f8865e664e61252e83df..434be4ba523feb78321e4bc93f700dd76d40fb40 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band39.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band39.conf
@@ -125,6 +125,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
     log_config : 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.conf
index 3f2d03d73c793daf85789c6c45caa095594a8b1b..eaee6dab18d109c643720ed16920606f022c2199 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.conf
@@ -117,6 +117,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
     log_config : 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf
index 2cccde680c11062e25e0bdbecf691de30bbeca19..b35a4c2271d707c8218aa929e8077c76c5df159d 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf
@@ -58,6 +58,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
     log_config : 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.dual.band7_band20.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.dual.band7_band20.conf
index ab2d8f583394f48ce69d22084f835405011d4f86..3d270e3862145bf528ecfbe5cd1b17d28b141d95 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.dual.band7_band20.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.dual.band7_band20.conf
@@ -193,6 +193,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
     
     log_config : 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf
index f08784c9e339afee6485405582dbe05c5e08d096..9c39aaa665ddb9dab982745840808d254248db62 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf
@@ -46,6 +46,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.81/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf
index 13906defb0d361acc452cc3116743ec6c131b330..1fc22d023ed38cbbc46224eeabe8434ecaf2066b 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf
@@ -48,6 +48,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.13.10/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
   }
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf
index c6477899ce9257fb04b9742e3facfff75b5aac71..1dfbb4a0f2af203af0d29eaf6985f74a30f20d93 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf
@@ -53,6 +53,7 @@ eNBs =
 
         ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.31/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
   },