diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 014f49a..cb16842 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,18 +9,18 @@ default_stages: [commit]
 repos:
   # Check formatting and lint for starlark code
   - repo: https://github.com/keith/pre-commit-buildifier
-    rev: 4.0.1.1
+    rev: 6.4.0
     hooks:
       - id: buildifier
       - id: buildifier-lint
   # Enforce that commit messages allow for later changelog generation
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.18.0
+    rev: v3.24.0
     hooks:
       # Requires that commitizen is already installed
       - id: commitizen
         stages: [commit-msg]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: 'v2.4.0'
+    rev: v3.1.0
     hooks:
       - id: prettier
diff --git a/BUILD.bazel b/BUILD.bazel
index 9005145..0baef78 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@buildifier_prebuilt//:rules.bzl", "buildifier")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
@@ -11,16 +11,23 @@ gazelle_binary(
 )
 
 # gazelle:exclude @bazel/*
+
 gazelle(
     name = "gazelle",
     gazelle = "gazelle_bin",
 )
 
+buildifier(
+    name = "buildifier",
+    exclude_patterns = ["./.git/*"],
+    lint_mode = "fix",
+    mode = "fix",
+    tags = ["manual"],  # tag as manual so windows ci does not build it by default
+)
+
 buildifier(
     name = "buildifier.check",
-    exclude_patterns = [
-        "./.git/*",
-    ],
+    exclude_patterns = ["./.git/*"],
     lint_mode = "warn",
     mode = "diff",
     tags = ["manual"],  # tag as manual so windows ci does not build it by default
diff --git a/MODULE.bazel b/MODULE.bazel
index 895d7a4..f90cd28 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -13,6 +13,6 @@ bazel_dep(name = "bazel_skylib", version = "1.4.1")
 ####### Dev dependencies ########
 
 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
-bazel_dep(name = "buildifier_prebuilt", version = "6.1.2.1", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle")
 bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True)
diff --git a/WORKSPACE b/WORKSPACE
index b130ad0..2871205 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,9 +1,4 @@
-# Declare the local Bazel workspace.
-# This is *not* included in the published distribution.
-workspace(
-    # see https://docs.bazel.build/versions/main/skylark/deploying.html#workspace
-    name = "aspect_rules_webpack",
-)
+workspace(name = "aspect_rules_webpack")
 
 load("//:internal_deps.bzl", "rules_webpack_internal_deps")
 
@@ -50,8 +45,8 @@ register_unittest_toolchains()
 
 ############################################
 # Gazelle, for generating bzl_library targets
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 
diff --git a/e2e/loaders/BUILD.bazel b/e2e/loaders/BUILD.bazel
index b9c75c7..f13b68a 100644
--- a/e2e/loaders/BUILD.bazel
+++ b/e2e/loaders/BUILD.bazel
@@ -1,7 +1,7 @@
-load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@aspect_rules_js//js:defs.bzl", "js_run_devserver")
 load("@aspect_rules_webpack//webpack:defs.bzl", "webpack_bundle")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@aspect_rules_js//js:defs.bzl", "js_run_devserver")
+load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@npm//:http-server/package_json.bzl", http_server_bin = "bin")
 
 http_server_bin.http_server_binary(
diff --git a/e2e/worker/BUILD.bazel b/e2e/worker/BUILD.bazel
index 43cd181..085f44a 100644
--- a/e2e/worker/BUILD.bazel
+++ b/e2e/worker/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
+load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@aspect_rules_webpack//webpack:defs.bzl", "webpack_bundle")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
diff --git a/internal_deps.bzl b/internal_deps.bzl
index a98a97b..66e3675 100644
--- a/internal_deps.bzl
+++ b/internal_deps.bzl
@@ -44,9 +44,7 @@ def rules_webpack_internal_deps():
 
     http_archive(
         name = "buildifier_prebuilt",
-        sha256 = "e46c16180bc49487bfd0f1ffa7345364718c57334fa0b5b67cb5f27eba10f309",
-        strip_prefix = "buildifier-prebuilt-6.1.0",
-        urls = [
-            "https://github.com/keith/buildifier-prebuilt/archive/6.1.0.tar.gz",
-        ],
+        sha256 = "8ada9d88e51ebf5a1fdff37d75ed41d51f5e677cdbeafb0a22dda54747d6e07e",
+        strip_prefix = "buildifier-prebuilt-6.4.0",
+        urls = ["http://github.com/keith/buildifier-prebuilt/archive/6.4.0.tar.gz"],
     )
diff --git a/webpack/tests/simple/BUILD.bazel b/webpack/tests/simple/BUILD.bazel
index 7d20255..c78b386 100644
--- a/webpack/tests/simple/BUILD.bazel
+++ b/webpack/tests/simple/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
+load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("//webpack:defs.bzl", "webpack_bundle")
 
 webpack_bundle(