diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 45d11dfaa8..aab865ec7b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
         -->
         <activity-alias
             android:name="${applicationId}.App"
+            android:exported="true"
             android:targetActivity=".HomeActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -71,6 +72,7 @@
         <!-- Activity alias from Fennec used by PWA launchers on the home screen -->
         <activity-alias
             android:name="org.mozilla.gecko.LauncherActivity"
+            android:exported="true"
             android:targetActivity=".IntentReceiverActivity">
             <intent-filter>
                 <action android:name="org.mozilla.gecko.WEBAPP" />
@@ -79,6 +81,7 @@
 
         <activity
             android:name=".HomeActivity"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|layoutDirection|smallestScreenSize|screenLayout"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
@@ -268,6 +271,7 @@
 
         <service
             android:name=".autofill.AutofillService"
+            android:exported="true"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE">
             <intent-filter>
@@ -291,9 +295,13 @@
             </intent-filter>
         </service>
 
-        <service android:name=".downloads.DownloadService" />
+        <service
+            android:name=".downloads.DownloadService"
+            android:exported="false" />
+
         <receiver
-            android:name="org.mozilla.gecko.search.SearchWidgetProvider">
+            android:name="org.mozilla.gecko.search.SearchWidgetProvider"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
diff --git a/app/src/nightly/AndroidManifest.xml b/app/src/nightly/AndroidManifest.xml
index 5fdb32de41..5782ccaefd 100644
--- a/app/src/nightly/AndroidManifest.xml
+++ b/app/src/nightly/AndroidManifest.xml
@@ -4,8 +4,10 @@
 
     <application>
 
-        <service android:name=".customtabs.CustomTabsService">
-            <!-- Trusted Web Activities are currently only supported in nightly. -->
+        <service
+            android:name=".customtabs.CustomTabsService"
+            android:exported="true">
+        <!-- Trusted Web Activities are currently only supported in nightly. -->
             <intent-filter tools:node="removeAll" />
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index ed6f95683e..33441d5642 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -13,7 +13,7 @@ object Config {
     // Synchronized build configuration for all modules
     const val compileSdkVersion = 31
     const val minSdkVersion = 21
-    const val targetSdkVersion = 30
+    const val targetSdkVersion = 31
 
     @JvmStatic
     private fun generateDebugVersionName(): String {