diff --git a/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs
index 8b9c3464e3..be5b66415c 100644
--- a/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Runtime.Versioning;
 using CommunityToolkit.Maui.Core.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.LifecycleEvents;
@@ -9,6 +10,11 @@ namespace CommunityToolkit.Maui.Core;
 /// <summary>
 /// <see cref="MauiAppBuilder"/> Extensions
 /// </summary>
+[SupportedOSPlatform("iOS15.0")]
+[SupportedOSPlatform("MacCatalyst15.0")]
+[SupportedOSPlatform("Android21.0")]
+[SupportedOSPlatform("Windows10.0.17763")]
+[SupportedOSPlatform("Tizen6.5")]
 public static class AppBuilderExtensions
 {
 	/// <summary>
diff --git a/src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs
similarity index 86%
rename from src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs
rename to src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs
index 865d23d379..dcba35adc2 100644
--- a/src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs
@@ -1,11 +1,17 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.Versioning;
 
 namespace CommunityToolkit.Maui.Maps;
 
 /// <summary>
 /// Maps Extensions for <see cref="MauiAppBuilder"/>
 /// </summary>
-public static class AppHostBuilderExtensions
+[SupportedOSPlatform("iOS15.0")]
+[SupportedOSPlatform("MacCatalyst15.0")]
+[SupportedOSPlatform("Android21.0")]
+[SupportedOSPlatform("Windows10.0.17763")]
+[SupportedOSPlatform("Tizen6.5")]
+public static class AppBuilderExtensions
 {
 	/// <summary>
 	/// Initializes the .NET MAUI Community Toolkit Maps Library
diff --git a/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs
index 6d1cd023ac..f2ee5d594b 100644
--- a/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Maui.Core.Handlers;
+using System.Runtime.Versioning;
+using CommunityToolkit.Maui.Core.Handlers;
 using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui;
@@ -6,6 +7,11 @@ namespace CommunityToolkit.Maui;
 /// <summary>
 /// This class contains MediaElement's <see cref="MauiAppBuilder"/> extensions.
 /// </summary>
+[SupportedOSPlatform("iOS15.0")]
+[SupportedOSPlatform("MacCatalyst15.0")]
+[SupportedOSPlatform("Android26.0")]
+[SupportedOSPlatform("Windows10.0.17763")]
+[SupportedOSPlatform("Tizen6.5")]
 public static class AppBuilderExtensions
 {
 	/// <summary>
diff --git a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
index 5e45d440ee..0b38801ce5 100644
--- a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Maui.Core;
+using System.Runtime.Versioning;
+using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Core.Handlers;
 using CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific;
 using CommunityToolkit.Maui.Views;
@@ -8,6 +9,11 @@ namespace CommunityToolkit.Maui;
 /// <summary>
 /// Extensions for MauiAppBuilder
 /// </summary>
+[SupportedOSPlatform("iOS15.0")]
+[SupportedOSPlatform("MacCatalyst15.0")]
+[SupportedOSPlatform("Android21.0")]
+[SupportedOSPlatform("Windows10.0.17763")]
+[SupportedOSPlatform("Tizen6.5")]
 public static class AppBuilderExtensions
 {
 	/// <summary>
@@ -34,7 +40,10 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder
 		});
 
 		Popup.RemapForControls();
+
+#if ANDROID
 		NavigationBar.RemapForControls();
+#endif
 		return builder;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs
index c3a569c430..74272b6494 100644
--- a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs
+++ b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs
@@ -93,7 +93,7 @@ public static void MapNavigationColorProperty(IPageHandler handler, IContentView
 
 		var color = GetColor(page).ToPlatform();
 
-		if (OperatingSystem.IsAndroidVersionAtLeast(21))
+		if (OperatingSystem.IsAndroidVersionAtLeast(23))
 		{
 			window.SetNavigationBarColor(color);
 		}
diff --git a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs
index db95defbc6..017c3d3704 100644
--- a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs
+++ b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs
@@ -8,7 +8,7 @@ namespace CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific;
 /// <summary>
 /// Provides platform-specific configuration properties for the Android navigation bar.
 /// </summary>
-[SupportedOSPlatform("Android21.0")]
+[SupportedOSPlatform("Android23.0")]
 public static partial class NavigationBar
 {
 	/// <summary>