diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 8ddd6e7..12889a4 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -1489,6 +1489,7 @@
   <apn carrier="Movistar CO" mcc="732" mnc="102" apn="internet.movistar.com.co" user="movistar" password="movistar" type="default,supl" />
   <apn carrier="Tigo MMS" mcc="732" mnc="103" apn="mms.colombiamovil.com.co" user="mms-cm1900" password="mms-cm1900" mmsc="mmsc.colombiamovil.com.co" mmsproxy="190.102.206.48" mmsport="8080" type="mms" />
   <apn carrier="Tigo" mcc="732" mnc="103" apn="web.colombiamovil.com.co" type="default,supl" />
+  <apn carrier="Tigo HN" mcc="708" mnc="20" apn="tiho.hn.com" />
   <apn carrier="OLA" mcc="732" mnc="111" apn="internet" user="internet" password="internet" type="default,supl" />
   <apn carrier="OLA MMS" mcc="732" mnc="111" apn="mms.comcel.com.co" mmsc="http://mms.ola.com.co" mmsproxy="200.058.228.081" mmsport="9201" type="mms" />
   <apn carrier="Movistar CO" mcc="732" mnc="123" apn="internet.movistar.com.co" user="movistar" password="movistar" type="default,supl" />
diff --git a/vendorsetup.sh b/vendorsetup.sh
index c87e085..a569080 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -24,10 +24,8 @@
 add_lunch_combo slim_i9300-userdebug
 add_lunch_combo slim_jflte-userdebug
 add_lunch_combo slim_ls980-userdebug
-add_lunch_combo slim_m7att-userdebug
+add_lunch_combo slim_m7-userdebug
 add_lunch_combo slim_m7spr-userdebug
-add_lunch_combo slim_m7tmo-userdebug
-add_lunch_combo slim_m7ul-userdebug
 add_lunch_combo slim_m7vzw-userdebug
 add_lunch_combo slim_maguro-userdebug
 add_lunch_combo slim_mako-userdebug