diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 2cf3734..8ea4e0f 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1952,17 +1952,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="T-Mobile UK"
-      mcc="234"
-      mnc="30"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
-      mmsproxy="149.254.201.135"
-      mmsport="8080"
-      type="default,supl,mms"
-  />
 
   <apn carrier="Virgin Media"
       mcc="234"
@@ -1975,81 +1964,118 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="EE Internet"
       mcc="234"
-      mnc="31"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      type="default,supl"
+      mnc="30"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="T-Mobile Picture Message"
+  <apn carrier="EE MMS"
       mcc="234"
-      mnc="31"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
+      mnc="30"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="EE Internet"
       mcc="234"
-      mnc="32"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      type="default,supl"
+      mnc="31"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="T-Mobile Picture Message"
+  <apn carrier="EE MMS"
       mcc="234"
-      mnc="32"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
+      mnc="31"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Orange Internet"
+  <apn carrier="EE Internet"
       mcc="234"
-      mnc="33"
-      apn="orangeinternet"
-      authtype="2"
-      type="default"
+      mnc="32"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="EE MMS"
       mcc="234"
-      mnc="33"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
+      mnc="32"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
       mmsport="8080"
-      authtype="2"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Orange internet"
+  <apn carrier="EE Internet"
       mcc="234"
-      mnc="34"
-      apn="orangeinternet"
-      type="default,supl"
+      mnc="33"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="EE MMS"
+      mcc="234"
+      mnc="33"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="34"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="EE MMS"
+      mcc="234"
+      mnc="34"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2129,20 +2155,26 @@
       type="default,supl"
   />
 
-  <apn carrier="Orange internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="86"
-      apn="orangeinternet"
-      type="default,supl"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl,dun"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="86"
-      apn="orangemms"
-      mmsc="http://mms.orange.co.uk/"
-      mmsproxy="192.168.224.10"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />