diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/all.sfr.yang_vswitch.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/all.sfr.yang_vswitch.conf
index 1c0628ea518ad0971bf6af6931c74e41a86515b6..e4a9d0cfc0cca49ab1788166588ba1190c607639 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/all.sfr.yang_vswitch.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/all.sfr.yang_vswitch.conf
@@ -24,6 +24,15 @@ eNBs =
                               preference = "ipv4";
                             }
                           );
+                          
+    NETWORK_INTERFACES : 
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "cpenb0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.30.117/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "upenb0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.31.117/24";
+    };
   }
 );
 
@@ -58,14 +67,14 @@ MME :
         # Number of streams to use in input/output
         SCTP_INSTREAMS = 32;
         SCTP_OUTSTREAMS = 32;
-    }
+    };
 
     # ------- S1AP definitions
     S1AP : 
     {
         # outcome drop timer value (seconds)
         S1AP_OUTCOME_TIMER = 10;
-    }
+    };
 
     # ------- MME served GUMMEI
     GUMMEI :
@@ -84,11 +93,11 @@ MME :
         # max values = 999.999:65535
         # maximum of 32 values, comma separated
         PLMN = ( 
-             {MCC=208 , MNC=38,  TAC = 0 },
-             {MCC=209 , MNC=130, TAC = 4 },
-             {MCC=208 , MNC=35,  TAC = 8 }
-        )
-    }
+             {MCC=208 ; MNC=38;  TAC = 0; },
+             {MCC=209 ; MNC=130; TAC = 4; },
+             {MCC=208 ; MNC=35;  TAC = 8; }
+        );
+    };
     
     NETWORK_INTERFACES : 
     {
@@ -97,7 +106,7 @@ MME :
 
         MME_INTERFACE_NAME_FOR_S11_MME        = "s11mme";
         MME_IPV4_ADDRESS_FOR_S11_MME          = "192.168.33.117/24";
-    }
+    };
 };
 
 S-GW :