diff --git a/apply_patches.sh b/apply_patches.sh
index f4d4d4f..69d915b 100755
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -55,9 +55,11 @@ pt_special ()
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
     DEST=$DESTDIR/vendor/
-    OPTIONS="--directory=$DEST --p=1"
+    OPTIONS="-p=1"
 
+    pushd $DEST
     git apply $OPTIONS patches/20210820_l10n-co-account-e-invoicing_installs-in-production.patch
+    popd
 }
 
 pt_community ()
@@ -66,11 +68,13 @@ pt_community ()
     echo " Patch OCA modules"
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
-    DEST=$DESTDIR/community/auth_oauth_multi_token/
+    DEST=$DESTDIR/community/base_location/
     OPTIONS="--directory=$DEST --strip=1"
+    patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch
 
-    patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch
-
+    # DEST=$DESTDIR/community/auth_oauth_multi_token/
+    # OPTIONS="--directory=$DEST --strip=1"
+    # patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch
 }
 
 pt_all ()
diff --git a/patches/20210820_l10n-co-account-e-invoicing_installs-in-production.patch b/patches/20210820_l10n-co-account-e-invoicing_installs-in-production.patch
index c5cf1b7..f94bcc1 100644
--- a/patches/20210820_l10n-co-account-e-invoicing_installs-in-production.patch
+++ b/patches/20210820_l10n-co-account-e-invoicing_installs-in-production.patch
@@ -200,3 +200,12 @@ index eed50a8..3729340 100644
 -}
 \ No newline at end of file
 +}
+diff --git a/requirements.txt b/requirements.txt
+new file mode 100644
+index 0000000..d31443f
+--- /dev/null
++++ b/requirements.txt
+@@ -0,0 +1,3 @@
++xades
++cryptography==3.3.2
++pyopenssl==17.5.0
diff --git a/patches/20210821_base-location_no-zip-from-city.patch b/patches/20210821_base-location_no-zip-from-city.patch
new file mode 100644
index 0000000..251eb0e
--- /dev/null
+++ b/patches/20210821_base-location_no-zip-from-city.patch
@@ -0,0 +1,12 @@
+diff -rupN base_location/models/res_partner.py base_location.patch/models/res_partner.py
+--- base_location/models/res_partner.py	2021-08-20 17:44:18.311780135 -0500
++++ base_location.patch/models/res_partner.py	2021-08-21 10:08:31.178805592 -0500
+@@ -32,7 +32,7 @@ class ResPartner(models.Model):
+     )
+     state_id = fields.Many2one(compute="_compute_state_id", readonly=False, store=True)
+ 
+-    @api.depends("state_id", "country_id", "city_id", "zip")
++    @api.depends("state_id", "country_id")
+     def _compute_zip_id(self):
+         """Empty the zip auto-completion field if data mismatch when on UI."""
+         for record in self.filtered("zip_id"):
diff --git a/selected_oca_modules.txt b/selected_oca_modules.txt
index 64cadcd..0efd912 100644
--- a/selected_oca_modules.txt
+++ b/selected_oca_modules.txt
@@ -1,21 +1,3 @@
-account-financial-reporting/account_financial_report/
-account-financial-tools/account_asset_management/
-account-financial-tools/account_fiscal_year/
-account-financial-tools/account_menu/
-account-invoicing/account_invoice_force_number/
-bank-payment/account_payment_mode/
-bank-payment/account_payment_order/
-bank-payment/account_payment_partner/
-credit-control/account_credit_control/
-helpdesk/helpdesk_mgmt/
-hr/hr_branch/
 partner-contact/base_location/
 partner-contact/partner_fax/
 partner-contact/partner_identification/
-reporting-engine/report_xlsx/
-reporting-engine/report_xlsx_helper/
-server-auth/auth_oauth_multi_token/
-server-backend/base_user_role/
-server-ux/date_range/
-web/web_m2x_options/
-web/web_responsive/