diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
index 37848b17cf..4d022ec10f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
@@ -36,6 +36,7 @@ protected async override void OnStart()
 
             await deviceCoordinator.ApplyTheme(AppInfo.Current.RequestedTheme is AppTheme.Dark);
 
+//-:cnd:noEmit
 #if Android
 
             //+:cnd:noEmit
@@ -58,6 +59,7 @@ protected async override void OnStart()
                 await App.Current!.Windows.First().Page!.DisplayAlert("Boilerplate", localizer[nameof(AppStrings.UpdateWebViewThroughGooglePlay)], localizer[nameof(AppStrings.Ok)]);
                 await Launcher.OpenAsync($"https://play.google.com/store/apps/details?id={Android.Webkit.WebView.CurrentWebViewPackage.PackageName}");
             }
+//-:cnd:noEmit
 #endif
         }
         catch (Exception exp)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
index 02af214bac..91cfff4c4c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
@@ -12,7 +12,6 @@
         <BlazorCacheBootResources Condition=" '$(PwaEnabled)' == 'true' ">false</BlazorCacheBootResources>
         <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
         <!--/+:msbuild-conditional:noEmit -->
-        <!-- Disabled WasmSIMD because of dotnet 8 issue on safari (iOS 16.3 and older devices)  -->
         <WasmEnableSIMD Condition=" '$(framework)' == 'net8.0'">false</WasmEnableSIMD>
         <WasmStripILAfterAOT Condition=" '$(offlineDb)' == 'false'">true</WasmStripILAfterAOT>
         <WasmBuildNative Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''">true</WasmBuildNative>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index 469bbbbbb4..a51bea5b4a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -32,12 +32,12 @@ self.externalAssets = [
     },
     {
         //#if (framework == "net9.0")
-        url: "_framework/blazor.web.js?v=9.0.0-rc.2.24474.3"
+        url: "_framework/blazor.web.js?ver=9.0.0-rc.2.24474.3"
         //#else
             //#if (IsInsideProjectTemplate == true)
             /*
             //#endif
-        url: "_framework/blazor.web.js?v=8.0.403"
+        url: "_framework/blazor.web.js?ver=8.0.403"
             //#if (IsInsideProjectTemplate == true)
             */
             //#endif
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
index 781f9a7162..010b748493 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
@@ -73,12 +73,12 @@
     @if (HttpContext.Request.IsCrawlerClient() is false)
     {
         @*#if (framework == "net9.0")*@
-        <Script src="_framework/blazor.web.js?v=9.0.100-rc.2.24474.11" autostart="false"></Script>
+        <Script src="_framework/blazor.web.js?ver=9.0.100-rc.2.24474.11" autostart="false"></Script>
         @*#else*@
             @*#if (IsInsideProjectTemplate == true)*@
             /*
             @*#endif)*@
-        <Script src="_framework/blazor.web.js?v=8.0.403" autostart="false"></Script>
+        <Script src="_framework/blazor.web.js?ver=8.0.403" autostart="false"></Script>
             @*#if (IsInsideProjectTemplate == true)*@
             */
             @*#endif)*@