diff --git a/.bazelrc b/.bazelrc
index 402ac2662..fceb98abc 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,8 +2,9 @@
 startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
 
 common --enable_platform_specific_config
-# TODO: remove once bazel flips this flag
-common --incompatible_disallow_empty_glob
+
+# TODO: remove once issues with yanked versions are resolved
+common --allow_yanked_versions=rules_cc@0.1.0
 
 coverage --experimental_ui_max_stdouterr_bytes=10485760
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 7ae78044f..6cc313b82 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,10 +1,9 @@
 module(name = "maplibre")
 
-bazel_dep(name = "apple_support", version = "1.17.1", repo_name = "build_bazel_apple_support")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "rules_apple", version = "3.16.1", repo_name = "build_bazel_rules_apple")
-bazel_dep(name = "rules_swift", version = "2.2.3", repo_name = "build_bazel_rules_swift")
+bazel_dep(name = "rules_apple", version = "3.19.0")
+bazel_dep(name = "rules_swift", version = "2.5.0")
 bazel_dep(name = "rules_xcodeproj", version = "2.10.0")
 bazel_dep(name = "aspect_rules_js", version = "2.1.3")
 bazel_dep(name = "rules_nodejs", version = "6.3.3")
@@ -28,7 +27,7 @@ pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
 # bazel run -- @pnpm --dir /home/runner/work/rules_js/rules_js install
 use_repo(pnpm, "pnpm")
 
-provisioning_profile_repository = use_extension("@build_bazel_rules_apple//apple:apple.bzl", "provisioning_profile_repository_extension")
+provisioning_profile_repository = use_extension("@rules_apple//apple:apple.bzl", "provisioning_profile_repository_extension")
 provisioning_profile_repository.setup()
 
 http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
diff --git a/platform/darwin/BUILD.bazel b/platform/darwin/BUILD.bazel
index b9d87fa55..d9e86bb5e 100644
--- a/platform/darwin/BUILD.bazel
+++ b/platform/darwin/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library", "js_run_binary")
 load(
-    "@build_bazel_rules_swift//swift:swift.bzl",
+    "@rules_swift//swift:swift.bzl",
     "swift_library",
 )
 load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS", "WARNING_FLAGS")
diff --git a/platform/ios/BUILD.bazel b/platform/ios/BUILD.bazel
index 1b9eb34ba..c7ce3e9b9 100644
--- a/platform/ios/BUILD.bazel
+++ b/platform/ios/BUILD.bazel
@@ -1,9 +1,9 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
-load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_xcframework", "apple_xcframework")
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_framework")
-load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
-load("@build_bazel_rules_apple//apple:versioning.bzl", "apple_bundle_version")
 load("@darwin_config//:config.bzl", "BUNDLE_ID_PREFIX")
+load("@rules_apple//apple:apple.bzl", "apple_static_xcframework", "apple_xcframework")
+load("@rules_apple//apple:ios.bzl", "ios_application", "ios_framework")
+load("@rules_apple//apple:resources.bzl", "apple_resource_bundle")
+load("@rules_apple//apple:versioning.bzl", "apple_bundle_version")
 load(
     "@rules_xcodeproj//xcodeproj:defs.bzl",
     "top_level_target",
diff --git a/platform/ios/app-swift/BUILD.bazel b/platform/ios/app-swift/BUILD.bazel
index 61fbbe8e0..0fd4e3da0 100644
--- a/platform/ios/app-swift/BUILD.bazel
+++ b/platform/ios/app-swift/BUILD.bazel
@@ -1,9 +1,9 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
+load("@darwin_config//:config.bzl", "BUNDLE_ID_PREFIX")
+load("@rules_apple//apple:ios.bzl", "ios_application")
 load(
-    "@build_bazel_rules_swift//swift:swift.bzl",
+    "@rules_swift//swift:swift.bzl",
     "swift_library",
 )
-load("@darwin_config//:config.bzl", "BUNDLE_ID_PREFIX")
 load("//platform/ios/bazel:provisioning.bzl", "configure_device_profiles")
 
 configure_device_profiles()
diff --git a/platform/ios/bazel/provisioning.bzl b/platform/ios/bazel/provisioning.bzl
index 2205f7327..c4b787947 100644
--- a/platform/ios/bazel/provisioning.bzl
+++ b/platform/ios/bazel/provisioning.bzl
@@ -1,5 +1,5 @@
-load("@build_bazel_rules_apple//apple:apple.bzl", "local_provisioning_profile")
 load("@darwin_config//:config.bzl", "APPLE_MOBILE_PROVISIONING_PROFILE_NAME", "APPLE_MOBILE_PROVISIONING_PROFILE_TEAM_ID")
+load("@rules_apple//apple:apple.bzl", "local_provisioning_profile")
 load("@rules_xcodeproj//xcodeproj:defs.bzl", "xcode_provisioning_profile")
 
 def configure_device_profiles():
diff --git a/platform/ios/benchmark/assets/BUILD.bazel b/platform/ios/benchmark/assets/BUILD.bazel
index cf1a684cd..81e4a978d 100644
--- a/platform/ios/benchmark/assets/BUILD.bazel
+++ b/platform/ios/benchmark/assets/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_group")
+load("@rules_apple//apple:resources.bzl", "apple_resource_group")
 
 apple_resource_group(
     name = "benchmark_assets",
diff --git a/platform/ios/iosapp-UITests/BUILD.bazel b/platform/ios/iosapp-UITests/BUILD.bazel
index eee82f4a6..7366b2826 100644
--- a/platform/ios/iosapp-UITests/BUILD.bazel
+++ b/platform/ios/iosapp-UITests/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_ui_test")
+load("@rules_apple//apple:ios.bzl", "ios_ui_test")
 load(
-    "@build_bazel_rules_swift//swift:swift.bzl",
+    "@rules_swift//swift:swift.bzl",
     "swift_library",
 )
 load("//platform/ios/bazel:provisioning.bzl", "configure_device_profiles")
diff --git a/platform/ios/test/BUILD.bazel b/platform/ios/test/BUILD.bazel
index 2263751c3..c29e66228 100644
--- a/platform/ios/test/BUILD.bazel
+++ b/platform/ios/test/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
+load("@rules_apple//apple:ios.bzl", "ios_unit_test")
 load(
-    "@build_bazel_rules_swift//swift:swift.bzl",
+    "@rules_swift//swift:swift.bzl",
     "swift_library",
 )
 load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS", "WARNING_FLAGS")
@@ -51,7 +51,7 @@ ios_unit_test(
     name = "ios_test",
     timeout = "long",
     minimum_os_version = "12.0",
-    runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
+    runner = "@rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
     visibility = [
         "@rules_xcodeproj//xcodeproj:generated",
     ],
diff --git a/platform/ios/test/common/BUILD.bazel b/platform/ios/test/common/BUILD.bazel
index 63032ff29..ce3d30612 100644
--- a/platform/ios/test/common/BUILD.bazel
+++ b/platform/ios/test/common/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@darwin_config//:config.bzl", "BUNDLE_ID_PREFIX")
+load("@rules_apple//apple:ios.bzl", "ios_application")
 
 cc_library(
     name = "ios_test_runner_lib",
diff --git a/platform/ios/test/core/BUILD.bazel b/platform/ios/test/core/BUILD.bazel
index 9e29a5ae1..dec6adacd 100644
--- a/platform/ios/test/core/BUILD.bazel
+++ b/platform/ios/test/core/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_unit_test")
-load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
 load("@darwin_config//:config.bzl", "BUNDLE_ID_PREFIX")
+load("@rules_apple//apple:ios.bzl", "ios_application", "ios_unit_test")
+load("@rules_apple//apple:resources.bzl", "apple_resource_bundle")
 load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS")
 
 cc_library(
diff --git a/platform/macos/BUILD.bazel b/platform/macos/BUILD.bazel
index 7ef54ff48..af9bebb9c 100644
--- a/platform/macos/BUILD.bazel
+++ b/platform/macos/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
-load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
+load("@rules_apple//apple:macos.bzl", "macos_command_line_application")
 load(
     "@rules_xcodeproj//xcodeproj:defs.bzl",
     "top_level_target",
diff --git a/platform/macos/app/BUILD.bazel b/platform/macos/app/BUILD.bazel
index 459065e4a..e8b7216fb 100644
--- a/platform/macos/app/BUILD.bazel
+++ b/platform/macos/app/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
+load("@rules_apple//apple:macos.bzl", "macos_application")
 
 objc_library(
     name = "macos_app_lib",
diff --git a/render-test/ios/BUILD.bazel b/render-test/ios/BUILD.bazel
index 8bcec3e6a..d538780bb 100644
--- a/render-test/ios/BUILD.bazel
+++ b/render-test/ios/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
-load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
+load("@rules_apple//apple:ios.bzl", "ios_unit_test")
+load("@rules_apple//apple:resources.bzl", "apple_resource_bundle")
 load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS")
 
 apple_resource_bundle(
@@ -53,7 +53,7 @@ ios_unit_test(
     name = "RenderTest",
     minimum_os_version = "13.0",
     provisioning_profile = "//platform/ios:xcode_profile",
-    runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
+    runner = "@rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
     test_host = "//platform/ios/test/common:RenderTestApp",
     visibility = [
         "//visibility:public",