diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 55395308c..9ccc861f0 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -11,7 +11,7 @@ on:
     - cron: '1 11 * * *'
 env:
   # Bump this number to invalidate the GH actions cache
-  cache-version: 1
+  cache-version: 2
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/WORKSPACE b/WORKSPACE
index 56c5b9394..3769dbb09 100755
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -152,7 +152,7 @@ load(
 
 go_rules_dependencies()
 
-go_register_toolchains(version = "1.20.2")
+go_register_toolchains(version = "1.24.13")
 
 load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
 
diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
index cb043e39e..378b513bb 100644
--- a/non_module_dev_deps.bzl
+++ b/non_module_dev_deps.bzl
@@ -66,9 +66,9 @@ def repositories(*, bzlmod):
     # no modules are provided at the moment for buildifier
     http_archive(
         name = "com_github_bazelbuild_buildtools",
-        sha256 = "53119397bbce1cd7e4c590e117dcda343c2086199de62932106c80733526c261",
-        strip_prefix = "buildtools-8.2.1",
-        urls = ["https://github.com/bazelbuild/buildtools/archive/v8.2.1.tar.gz"],
+        sha256 = "f3b800e9f6ca60bdef3709440f393348f7c18a29f30814288a7326285c80aab9",
+        strip_prefix = "buildtools-8.5.1",
+        urls = ["https://github.com/bazelbuild/buildtools/archive/v8.5.1.tar.gz"],
     )
 
     nixpkgs_local_repository(
diff --git a/rules_haskell_nix/WORKSPACE.bzlmod b/rules_haskell_nix/WORKSPACE.bzlmod
index 0b68f939f..6c12ed843 100644
--- a/rules_haskell_nix/WORKSPACE.bzlmod
+++ b/rules_haskell_nix/WORKSPACE.bzlmod
@@ -13,9 +13,9 @@ nixpkgs_package(
 
 http_archive(
     name = "com_github_bazelbuild_buildtools",
-    sha256 = "53119397bbce1cd7e4c590e117dcda343c2086199de62932106c80733526c261",
-    strip_prefix = "buildtools-8.2.1",
+    sha256 = "f3b800e9f6ca60bdef3709440f393348f7c18a29f30814288a7326285c80aab9",
+    strip_prefix = "buildtools-8.5.1",
     urls = [
-        "https://github.com/bazelbuild/buildtools/archive/refs/tags/v8.2.1.tar.gz",
+        "https://github.com/bazelbuild/buildtools/archive/refs/tags/v8.5.1.tar.gz",
     ],
 )
diff --git a/rules_haskell_tests/non_module_deps.bzl b/rules_haskell_tests/non_module_deps.bzl
index 7b43f8c30..e3129fa91 100644
--- a/rules_haskell_tests/non_module_deps.bzl
+++ b/rules_haskell_tests/non_module_deps.bzl
@@ -48,9 +48,9 @@ def repositories(*, bzlmod):  # @unused
     # no modules are provided at the moment for buildifier
     http_archive(
         name = "com_github_bazelbuild_buildtools",
-        sha256 = "53119397bbce1cd7e4c590e117dcda343c2086199de62932106c80733526c261",
-        strip_prefix = "buildtools-8.2.1",
-        urls = ["https://github.com/bazelbuild/buildtools/archive/v8.2.1.tar.gz"],
+        sha256 = "f3b800e9f6ca60bdef3709440f393348f7c18a29f30814288a7326285c80aab9",
+        strip_prefix = "buildtools-8.5.1",
+        urls = ["https://github.com/bazelbuild/buildtools/archive/v8.5.1.tar.gz"],
     )
 
     http_archive(