diff --git a/BUILD.bazel b/BUILD.bazel
index 29bb0a582..d6f8b35af 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@buildifier_prebuilt//:rules.bzl", "buildifier", "buildifier_test")
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load("@rules_gazebo//gazebo:headers.bzl", "gz_configure_header", "gz_export_header")
 load("@rules_license//rules:license.bzl", "license")
 
@@ -94,3 +96,19 @@ test_sources = glob([
     )
     for src in test_sources
 ]
+
+buildifier(
+    name = "buildifier.fix",
+    exclude_patterns = ["./.git/*"],
+    lint_mode = "fix",
+    mode = "fix",
+)
+
+buildifier_test(
+    name = "buildifier.test",
+    exclude_patterns = ["./.git/*"],
+    lint_mode = "warn",
+    mode = "diff",
+    no_sandbox = True,
+    workspace = "//:MODULE.bazel",
+)
diff --git a/MODULE.bazel b/MODULE.bazel
index be6f28832..344f6ed30 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,23 +1,25 @@
-## MODULE.bazel
 module(
     name = "gz-rendering",
-    repo_name = "org_gazebosim_gz-rendering",
+    compatibility_level = 9,
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1")
 bazel_dep(name = "egl-registry", version = "0.0.0-20250527")
 bazel_dep(name = "googletest", version = "1.15.2")
 bazel_dep(name = "ogre-next", version = "2.3.3.bcr.2")
-bazel_dep(name = "rules_cc", version = "0.1.1")
+bazel_dep(name = "rules_cc", version = "0.2.0")
 bazel_dep(name = "rules_license", version = "1.0.0")
 
 # Gazebo Dependencies
-bazel_dep(name = "rules_gazebo", version = "0.0.3")
-bazel_dep(name = "gz-common")
-bazel_dep(name = "gz-math")
-bazel_dep(name = "gz-plugin")
-bazel_dep(name = "gz-utils")
+bazel_dep(name = "rules_gazebo", version = "0.0.6")
+bazel_dep(name = "gz-common", version = "7.0.0")
+bazel_dep(name = "gz-math", version = "9.0.0")
+bazel_dep(name = "gz-plugin", version = "4.0.0")
+bazel_dep(name = "gz-utils", version = "4.0.0")
 
+# Override Gz deps to be pulled from the `main` branches so that CI uses deps
+# from HEAD on `main`.
 archive_override(
     module_name = "gz-common",
     strip_prefix = "gz-common-main",
diff --git a/bazel/gz_rendering_engine_libraries.bzl b/bazel/gz_rendering_engine_libraries.bzl
index d4a73c450..b6f26da87 100644
--- a/bazel/gz_rendering_engine_libraries.bzl
+++ b/bazel/gz_rendering_engine_libraries.bzl
@@ -1,3 +1,7 @@
+"""
+Rules to add gz-rendering plugin libraries.
+"""
+
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
diff --git a/ogre2/BUILD.bazel b/ogre2/BUILD.bazel
index 177afcda6..2693534f3 100644
--- a/ogre2/BUILD.bazel
+++ b/ogre2/BUILD.bazel
@@ -1,4 +1,5 @@
 # Bazel targets for Ogre2 render engine plugin.
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_gazebo//gazebo:headers.bzl", "gz_export_header")
 load("//bazel:gz_rendering_engine_libraries.bzl", "gz_rendering_engine_libraries")
 
diff --git a/test/BUILD.bazel b/test/BUILD.bazel
index 313794821..947375157 100644
--- a/test/BUILD.bazel
+++ b/test/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_test")
+
 package(
     default_applicable_licenses = ["//:license"],
     features = [