diff --git a/.gitignore b/.gitignore
index 25478df3..8dcd6bab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ OsmAnd/system/
 OsmAnd/system
 data/repo/
 data/repo
+local/
+local
diff --git a/CommonInstaller b/CommonInstaller
index 7b385d9c..931f82a9 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -2218,9 +2218,6 @@ check_cfg_apps () {
 	# <= 18.1 has Orfox instead of TorBrowser, migrate
 	grep -q Orfox "${cfg_apps}" && sed -e 's/Orfox/TorBrowser/g' -i "${cfg_apps}"
 
-	# <= 18.4 has Adaway instead of Blockada, migrate
-	grep -q Adaway "${cfg_apps}" && sed -e 's/Adaway/Blokada/g' -i "${cfg_apps}"
-
 	# >= 20.7.92 no longer ships YahooWeatherProvider, remove
 	grep -q YahooWeatherProvider "${cfg_apps}" && sed -e '/YahooWeatherProvider/d' -i "${cfg_apps}"
 
@@ -2257,6 +2254,9 @@ check_cfg_apps () {
 	# >= 23.1 no longer ships XDA Labs, remove
 	grep -q XDALabs "${cfg_apps}" && sed -e '/XDALabs/d' -i "${cfg_apps}"
 
+	# >= 23.2 no longer ships Blokada, remove
+	grep -q Blokada "${cfg_apps}" && sed -e '/Blokada/d' -i "${cfg_apps}"
+
 }
 
 ##########################################################################################
diff --git a/data/build-package.database b/data/build-package.database
index 934dd59f..4d3d28b8 100644
--- a/data/build-package.database
+++ b/data/build-package.database
@@ -35,7 +35,6 @@ fd_AURORADROID=(fdroid com.aurora.adroid app AuroraDroid)
 
 fd_ALARMIO=(fdroid me.jfenn.alarmio app Alarmio)
 fd_ANYSOFTKEYBOARD=(fdroid com.menny.android.anysoftkeyboard app AnysoftKeyboard)
-fd_BLOCKADA=(fdroid org.blokada.fem.fdroid app Blokada)
 fd_FREETOPP=(fdroid org.liberty.android.freeotpplus app FreeOTPPlus)
 fd_FROST=(fdroid com.pitchedapps.frost app Frost)
 fd_HACKERSKEYBOARD=(fdroid org.pocketworkstation.pckeyboard app HackersKeyboard)
@@ -111,7 +110,6 @@ file_database=(
 	${appsfolder[3]}/AnysoftKeyboard/AnysoftKeyboard.apk.zst
 	${appsfolder[3]}/AuroraDroid/AuroraDroid.apk.zst
 	${appsfolder[3]}/AuroraStore/AuroraStore.apk.zst
-	${appsfolder[3]}/Blokada/Blokada.apk.zst
 	${appsfolder[3]}/FreeOTPPlus/FreeOTPPlus.apk.zst
 	${appsfolder[3]}/Frost/Frost.apk.zst
 	${appsfolder[3]}/FDroid/FDroid.apk.zst
diff --git a/doc/.nanodroid-apps b/doc/.nanodroid-apps
index d1efd6d7..c6e2e96a 100644
--- a/doc/.nanodroid-apps
+++ b/doc/.nanodroid-apps
@@ -15,7 +15,6 @@
 Alarmio
 Amaze
 AnysoftKeyboard
-Blokada
 FreeOTPPlus
 Frost
 HackersKeyboard
diff --git a/doc/Applications.md b/doc/Applications.md
index 1a7082ad..d55d0b91 100644
--- a/doc/Applications.md
+++ b/doc/Applications.md
@@ -24,7 +24,6 @@ Full list of included applications:
 * Alarmio (Alarm Clock) {Alarmio} [> F-Droid](https://f-droid.org/packages/me.jfenn.alarmio)
 * Amaze (File Manager) {Amaze} [> F-Droid](https://f-droid.org/packages/com.amaze.filemanager)
 * AnySoftKeyboard {AnysoftKeyboard} [> F-Droid](https://f-droid.org/packages/com.menny.android.anysoftkeyboard)
-* Blokada {Blokada} [> F-Droid](https://f-droid.org/en/packages/org.blokada.alarm)
 * FreeOTP+ (Two Factory Auth) {FreeOTPPlus} [> F-Droid](https://f-droid.org/en/packages/org.liberty.android.freeotpplus)
 * Frost (Facebook client) {Frost} [> F-Droid](https://f-droid.org/en/packages/com.pitchedapps.frost)
 * Hacker's Keyboard {HackersKeyboard} [> F-Droid](https://f-droid.org/de/packages/org.pocketworkstation.pckeyboard)