diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Server/wwwroot/.well-known/apple-app-site-association b/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Server/wwwroot/.well-known/apple-app-site-association
index c1673e501d..c3c75bd337 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Server/wwwroot/.well-known/apple-app-site-association
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Server/wwwroot/.well-known/apple-app-site-association
@@ -7,22 +7,34 @@
         "details": [
             {
                 "appID": "76WD644YU8.com.bitplatform.AdminPanel.Template",
-                "paths": [ "*", "/*" ],
-                "components": [
-                    {
-                        "/": "/*",
-                        "comment": "Matches any URL with a path that starts with /"
-                    }
+                "paths": [
+                    "NOT /api*",
+                    "NOT /odata*",
+                    "NOT /jobs*",
+                    "NOT /core*",
+                    "NOT /signalr*",
+                    "NOT /healthchecks-ui*",
+                    "NOT /healthz*",
+                    "NOT /swagger*",
+                    "NOT /signin*",
+                    "NOT /.well-known*",
+                    "*"
                 ]
             },
             {
                 "appID": "76WD644YU8.com.bitplatform.Todo.Template",
-                "paths": [ "*", "/*" ],
-                "components": [
-                    {
-                        "/": "/*",
-                        "comment": "Matches any URL with a path that starts with /"
-                    }
+                "paths": [
+                    "NOT /api*",
+                    "NOT /odata*",
+                    "NOT /jobs*",
+                    "NOT /core*",
+                    "NOT /signalr*",
+                    "NOT /healthchecks-ui*",
+                    "NOT /healthz*",
+                    "NOT /swagger*",
+                    "NOT /signin*",
+                    "NOT /.well-known*",
+                    "*"
                 ]
             }
         ]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs
index e1deca0e04..f54e9cf1f3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/MainActivity.cs
@@ -1,7 +1,8 @@
-using Android.App;
+//+:cnd:noEmit
+using Android.OS;
+using Android.App;
 using Android.Content;
 using Android.Content.PM;
-using Android.OS;
 using Boilerplate.Client.Core;
 using Java.Net;
 
@@ -9,8 +10,20 @@ namespace Boilerplate.Client.Maui.Platforms.Android;
 
 [IntentFilter([Intent.ActionView],
                         DataSchemes = ["https", "http"],
-                        DataHost = "bp.bitplatform.dev",
-                        DataPathPrefix = "/",
+                        DataHosts = ["bp.bitplatform.dev"],
+                        // the following app links will be opened in app instead of browser if the app is installed on Android device.
+                        DataPaths = ["/"],
+                        DataPathPrefixes = [
+                            "/confirm", "/forgot-password","/profile", "/reset-password", "/sign-in", "/sign-up", "/not-authorized", "/not-found","/terms", "/about",
+                            //#if (sample == "Admin")
+                            "/add-edit-category", "/categories", "/dashboard", "/products",
+                            //#elif (sample == "Todo")
+                            "/todo",
+                            //#endif
+                            //#if (offlineDb == true)
+                            "/offline-edit-profile"
+                            //#endif
+                            ],
                         AutoVerify = true,
                         Categories = [Intent.ActionView, Intent.CategoryDefault, Intent.CategoryBrowsable])]
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js
index 6148aa7b5e..75ff56403e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js
@@ -27,7 +27,9 @@ self.serverHandledUrls = [
     /\/signalr\//,
     /\/healthchecks-ui/,
     /\/healthz/,
-    /\/swagger/
+    /\/swagger/,
+    /\/signin-/,
+    /\/.well-known/
 ];
 
 self.defaultUrl = "/";