diff --git a/prebuilt/common/etc/apns-conf-mtk.xml b/prebuilt/common/etc/apns-conf-mtk.xml
index badf0a60241aadc681061f0a9ce314c2c85f6890..880d926080c64043584731af3cdb78162a1f1bff 100644
--- a/prebuilt/common/etc/apns-conf-mtk.xml
+++ b/prebuilt/common/etc/apns-conf-mtk.xml
@@ -2068,101 +2068,23 @@
        type="dun"
   />
   <apn
-       carrier="SFR Internet Mobile"
+       carrier="SFR webphone"
        mcc="208"
        mnc="10"
        apn="sl2sfr"
-       user=""
-       password=""
-       type="default,supl"
-  />
-  <apn
-       carrier="SFR MMS"
-       mcc="208"
-       mnc="10"
-       apn="mmssfr"
-       proxy=""
-       port=""
-       mmsproxy="10.151.0.1"
-       mmsport="8080"
-       mmsc="http://mms1"
-       user=""
-       password=""
-       type="mms"
-  />
-  <apn
-       carrier="SFR WEB"
-       mcc="208"
-       mnc="10"
-       apn="websfr"
-       user=""
-       password=""
-       type="default,dun"
-  />
-  <apn
-       carrier="SFR WAP"
-       mcc="208"
-       mnc="10"
-       apn="wapsfr"
-       proxy="195.115.25.129"
-       port="8080"
-       user="none"
-       password="none"
-       server="*"
-       mmsc=""
-       type="default,supl"
-  />
-  <apn
-       carrier="SFR MMS"
-       mcc="208"
-       mnc="10"
-       apn="mmssfr"
-       proxy=""
-       port=""
-       user=""
-       password=""
+       type="default,supl,hipri,mms,xcap"
        mmsc="http://mms1"
-       mmsproxy="10.151.0.1"
        mmsport="8080"
-       type="mms"
-  />
-  <apn
-       carrier="SFR"
-       mcc="208"
-       mnc="10"
-       apn="sl2sfr"
-       proxy=""
-       port=""
-       user=""
-       password=""
-       mmsc=""
-       type="default,supl"
-  />
-  <apn
-       carrier="SFR Option Modem"
-       mcc="208"
-       mnc="10"
-       apn="sl2sfr"
-       proxy=""
-       port=""
-       user=""
-       password=""
-       mmsc=""
-       type="default,dun"
+       mmsproxy="10.151.0.1"
+       protocol="IPV4V6"
   />
   <apn
-       carrier="SFR MMS"
+       carrier="SFR option modem"
        mcc="208"
        mnc="10"
-       apn="sl2sfr"
-       proxy=""
-       port=""
-       user=""
-       password=""
-       mmsc="http://mms1"
-       mmsproxy="10.151.0.1"
-       mmsport="8080"
-       type="mms"
+       apn="websfr"
+       type="dun"
+       protocol="IPV4V6"
   />
   <apn
        carrier="ACCESS DATA"
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 4a09b263f5e1051d9daba41fb63bfb29f48a5536..d53715ea80e5f287dc50ebced3f5b2ac10e7b6d0 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -175,14 +175,8 @@
   <apn carrier="NRJ MMS" mcc="208" mnc="10" apn="mmsnrj" proxy="" port="" mmsproxy="10.143.156.5" mmsport="8080" mmsc="http://mmsnrj" user="" password="" type="mms" />
   <apn carrier="NRJ WEB" mcc="208" mnc="10" apn="fnetnrj" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
   <apn carrier="NRJ Mobile FR Internet" mcc="208" mnc="10" apn="internetnrj" proxy="" port="" user="" password="" mmsc="" type="dun" />
-  <apn carrier="SFR Internet Mobile" mcc="208" mnc="10" apn="sl2sfr" user="" password="" type="default,supl" />
-  <apn carrier="SFR MMS" mcc="208" mnc="10" apn="mmssfr" proxy="" port="" mmsproxy="10.151.0.1" mmsport="8080" mmsc="http://mms1" user="" password="" type="mms" />
-  <apn carrier="SFR WEB" mcc="208" mnc="10" apn="websfr" user="" password="" type="default,dun" />
-  <apn carrier="SFR WAP" mcc="208" mnc="10" apn="wapsfr" proxy="195.115.25.129" port="8080" user="none" password="none" server="*" mmsc="" type="default,supl" />
-  <apn carrier="SFR MMS" mcc="208" mnc="10" apn="mmssfr" proxy="" port="" user="" password="" mmsc="http://mms1" mmsproxy="10.151.0.1" mmsport="8080" type="mms" />
-  <apn carrier="SFR" mcc="208" mnc="10" apn="sl2sfr" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="SFR Option Modem" mcc="208" mnc="10" apn="sl2sfr" proxy="" port="" user="" password="" mmsc="" type="default,dun" />
-  <apn carrier="SFR MMS" mcc="208" mnc="10" apn="sl2sfr" proxy="" port="" user="" password="" mmsc="http://mms1" mmsproxy="10.151.0.1" mmsport="8080" type="mms" />
+  <apn carrier="SFR webphone" mcc="208" mnc="10" apn="sl2sfr" type="default,supl,hipri,mms,xcap" mmsc="http://mms1" mmsport="8080" mmsproxy="10.151.0.1" protocol="IPV4V6" />
+  <apn carrier="SFR option modem" mcc="208" mnc="10" apn="websfr" type="dun" protocol="IPV4V6" />
   <apn carrier="SFR IMS" mcc="208" mnc="10" apn="ims" type="ims" protocol="IPV4V6" roaming_protocol="IPV4V6" />
   <apn carrier="ACCESS DATA" mcc="208" mnc="10" apn="websfr" proxy="" port="" user="" password="" mmsc="" mvno_type="spn" mvno_match_data="ACCESS DATA" type="supl" />
   <apn carrier="Internet Joe" mcc="208" mnc="10" apn="sl2sfr" authtype="0" type="default,supl,fota" />