diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/GENERIC_VM/epc_sfr_mme0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/GENERIC_VM/epc_sfr_mme0.conf
index 404b995131e54df18de94803e9d18e078e788992..fbe59494444ec21e70b797d25997a546ae7c35ca 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/GENERIC_VM/epc_sfr_mme0.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/GENERIC_VM/epc_sfr_mme0.conf
@@ -68,6 +68,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "vboxnet0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_calisson.conf
index 10bc3b2acae9d9189006938f5f05a2ac5e1f3745..d0234d872fe0eb91f658224395be68028f87cb05 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_calisson.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_calisson.conf
@@ -68,6 +68,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "tun11";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_olympie-Latitude-E6520.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_olympie-Latitude-E6520.conf
index 3d1adb34a528cbe2e63353e2b70e46d2abbbc68c..4b82bc8f66d8aaa925f27745b32b8a9b959a54c1 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_olympie-Latitude-E6520.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/epc_sfr_olympie-Latitude-E6520.conf
@@ -68,6 +68,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "tun11";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/epc.sfr.hades.vlan.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/epc.sfr.hades.vlan.conf
index 43eebac54b5a64f465ab5fdaca488ea597e1808e..61721244fb0d82486cad9075f24c372a84e0c3b4 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/epc.sfr.hades.vlan.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/epc.sfr.hades.vlan.conf
@@ -75,6 +75,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "eth1.1";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.memphis.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.memphis.conf
index 7630c7b005a81e047698caa2cbd9a4832705e2e9..db374d5faa832c2da9b38530eda4ba983275851d 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.memphis.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.memphis.conf
@@ -71,6 +71,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "eth0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.sud.conf
index a684b2ed96716b8097d4a3836947592166f61fe8..23c92ee1287fb0064f52e382e00e7795e6b583d0 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.sud.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.pft.sud.conf
@@ -71,6 +71,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "eth0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.default.vlan.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.default.vlan.conf
index 77bc1f00499c70ef27f754bf497ddfb4fdc686af..3f0a3811f415b2f816146ed30678c21b0e8317ff 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.default.vlan.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.default.vlan.conf
@@ -61,6 +61,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "eth2";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.hades.vlan.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.hades.vlan.conf
index b6e33646a1036cbd71e31ce8168fe57b2757744f..13285428e32c52a1bdd5ba19a692b72911bb7a30 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.hades.vlan.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.hades.vlan.conf
@@ -71,6 +71,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "eth1.1";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.yang.vswitch.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.yang.vswitch.conf
index f154c843c6ab04ea6135f256020162742dcbe7ad..32d196a83d530a094204cae5db80fa77f37c27ba 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.yang.vswitch.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.sfr.yang.vswitch.conf
@@ -61,6 +61,13 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "cpmme0";