diff --git a/BUILD.bazel b/BUILD.bazel
index d5b45b6fd0..8ff2abda0d 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -14,7 +14,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
+# load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
+load("@buildifier_prebuilt//:rules.bzl", "buildifier")
 
 exports_files(["LICENSE"])
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 9da2536df7..3b9174628e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,10 +1,9 @@
 module(name = "org_eclipse_iceroyx", version = "2.95.0")
 
-bazel_dep(name = "buildtools", dev_dependency = True, repo_name = "com_github_bazelbuild_buildtools")
-git_override(
-    module_name = 'buildtools',
-    remote = 'https://github.com/bazelbuild/buildtools.git',
-    commit = '37932ddd72301f8ca6075ee6b24e9e5d333c96a5', # Jun 28, 2024
+bazel_dep(
+    name = "buildifier_prebuilt",
+    version = "7.1.2",
+    dev_dependency = True,
 )
 bazel_dep(name = "cpptoml", version = "0.1.1")
 bazel_dep(name = "googletest", version = "1.15.2")