diff --git a/.gitlab/merge_request_templates/App inclusion.md b/.gitlab/merge_request_templates/App inclusion.md
index 2eac95879d..58bff26c2a 100644
--- a/.gitlab/merge_request_templates/App inclusion.md	
+++ b/.gitlab/merge_request_templates/App inclusion.md	
@@ -1,3 +1,6 @@
+**Note:** Apps targeting android sdk 30 (`targetSdk 30`) published through F-Droid currently cannot be installed on Android 11(R) devices.
+We are working on a solution for that but for now you might want to consider staying at targetSDK 29. The issue is tracked here: https://gitlab.com/fdroid/fdroidserver/-/issues/827
+
 * [ ] The app complies with the [inclusion criteria](https://f-droid.org/docs/Inclusion_Policy)
 * [ ] The original app author has been notified (and supports the inclusion)
 * [ ] All related [fdroiddata](https://gitlab.com/fdroid/fdroiddata/issues) and [RFP issues](https://gitlab.com/fdroid/rfp/issues) have been referenced in this merge request
diff --git a/.gitlab/merge_request_templates/App update.md b/.gitlab/merge_request_templates/App update.md
index b217a92232..40a85fcd0f 100644
--- a/.gitlab/merge_request_templates/App update.md	
+++ b/.gitlab/merge_request_templates/App update.md	
@@ -1,3 +1,6 @@
+**Note:** Apps targeting android sdk 30 (`targetSdk 30`) published through F-Droid currently cannot be installed on Android 11(R) devices.
+We are working on a solution for that but for now you might want to consider staying at targetSDK 29. The issue is tracked here: https://gitlab.com/fdroid/fdroidserver/-/issues/827
+
 * [ ] The app complies with the [inclusion criteria](https://f-droid.org/docs/Inclusion_Policy)
 * [ ] All related [fdroiddata](https://gitlab.com/fdroid/fdroiddata/issues) have been referenced in this merge request
 * [ ] The upstream app source code repo contains the app metadata _(summary/description/images/changelog/etc)_ in a [Fastlane](https://gitlab.com/snippets/1895688) or [Triple-T](https://gitlab.com/snippets/1901490) folder structure