diff --git a/.bazelrc.ci b/.bazelrc.ci
index 679a169bbaee46edc2bf106ead37db831230a6fb..ea22151ecc9fe6d2ad2b134ca9a08487ab920f17 100644
--- a/.bazelrc.ci
+++ b/.bazelrc.ci
@@ -26,7 +26,7 @@ test --test_output=errors
 test --test_verbose_timeout_warnings
 
 # Validate that the lockfile is correct
-common --lockfile_mode=error
+common --lockfile_mode=${CI_LOCKFILE_MODE}
 
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 331b53206bac2f879b0eb3f23952868b95cb84e7..7ad9321e255411af95be0d6d33f46811b64bea92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.4"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.5"
     inputs:
       variables: |
         CI_PROJECT_DIR
@@ -14,35 +14,58 @@ include:
         CI_COMMIT_REF_NAME
         CI_COMMIT_SHA
         CI_SERVER_HOST
+        CI_LOCKFILE_MODE
 
 default:
   tags:
     - arm64
 
-test:
+.test:
   extends: .bazelisk
   cache:
     - !reference [.bazelisk, cache]
     - key: "bazel-cache-${CI_PROJECT_ID}"
       paths:
-      - ".cache/bazel/disk"
-      - ".cache/bazel/repo"
+        - ".cache/bazel/disk"
+        - ".cache/bazel/repo"
+  variables:
+    CI_LOCKFILE_MODE: error
+    CONFIG: local
+  script:
+    - (cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...)
+
+config:
+  extends: .test
   parallel:
     matrix:
       - ROOT:
-        - .
-        - e2e
+          - .
+          - e2e
         CONFIG:
-        - local
-        - remote
-  script:
-    - cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...
+          - local
+          - remote
+
+version:
+  extends: .test
+  variables:
+    CI_LOCKFILE_MODE: "off"
+  parallel:
+    matrix:
+      - ROOT:
+          - .
+          - e2e
+        USE_BAZEL_VERSION:
+          - 7.1.0
+          - 7.x
+          - last_rc
 
 # TODO: switch this out for `rules_semantic_release`
 semantic-release:
+  extends: .test
   stage: .post
   needs:
-    - test
+    - config
+    - version
   image: node:lts
   cache:
     key:
@@ -55,8 +78,8 @@ semantic-release:
   before_script:
     - npm config --location project set cache "${CI_PROJECT_DIR}/.cache/npm"
     - npm ci --prefer-offline
+    - !reference [.bazelisk, before_script]
   script:
-    - !reference [.bazelisk-fragment, rc]
     - npx semantic-release
   rules:
     - if: $CI_COMMIT_TAG
diff --git a/MODULE.bazel b/MODULE.bazel
index 69356e706db9756ef9621e62100e633c08c6c3ca..b878d595a6da4d26d15bd080514cac869bd4bdfc 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -6,18 +6,18 @@ module(
     ],
 )
 
-bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.6")
-bazel_dep(name = "rules_gzip", version = "1.0.0-beta.1")
-bazel_dep(name = "rules_bzip2", version = "1.0.0-beta.1")
-bazel_dep(name = "rules_zstd", version = "1.0.0-beta.1")
-bazel_dep(name = "rules_xz", version = "1.0.0-beta.1")
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.12")
-bazel_dep(name = "ape", version = "1.0.0-beta.12")
+bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.7")
+bazel_dep(name = "rules_gzip", version = "1.0.0-beta.5")
+bazel_dep(name = "rules_bzip2", version = "1.0.0-beta.5")
+bazel_dep(name = "rules_zstd", version = "1.0.0-beta.6")
+bazel_dep(name = "rules_xz", version = "1.0.0-beta.5")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.17")
+bazel_dep(name = "ape", version = "1.0.0-beta.14")
 bazel_dep(name = "rules_go", version = "0.49.0")
 bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "gazelle", version = "0.38.0")
 
-bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0", dev_dependency = True)
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.1", dev_dependency = True)
 
 export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
 use_repo(export, "ape-tar")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 1c6934134867c51c7b3f4df114868738ed93e684..cb3e1508aad4c920b9d07c7a92bd6b0f51bea550 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -5,10 +5,8 @@
     "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
     "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
     "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/source.json": "7e3a9adf473e9af076ae485ed649d5641ad50ec5c11718103f34de03170d94ad",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.12/MODULE.bazel": "e75be27b37a2f7cf83dbeb497aeac93f8da9aa55fc2b35a9a1cb46db9b7f8885",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.12/source.json": "4b9e00b30d41ff209d7deddba1fbb4538cdfc7a54b4e07e607134ccc147e6a29",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.6/MODULE.bazel": "247bcdbc358206c37ce8bf1c850115002c6560570d96f9ac8a79dd810b18ea85",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.7/MODULE.bazel": "cb8163d01ede65cb41bf1449d6e5091e6da8d927cf700103d9a0c48517f3c1bf",
+    "https://bcr.bazel.build/modules/ape/1.0.0-beta.14/MODULE.bazel": "a57aea83a0c957cbe3caf0dbec6eb85c0a9eb9dfa99808a197a8ae11a50bc565",
+    "https://bcr.bazel.build/modules/ape/1.0.0-beta.14/source.json": "e1f55124e33498466e3ff43a15f9272e3204d7816ee81510b67a0fdc6bcb2574",
     "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
     "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
     "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.0/MODULE.bazel": "2ee4360a135da51ec06ca49cc4310f5a4c2839118f38ea8417f7f2db56967285",
@@ -30,8 +28,11 @@
     "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
+    "https://bcr.bazel.build/modules/bzip2/1.0.8.bcr.1/MODULE.bazel": "8ec3d613ef3f5572302daa08c7f68f34795cafe9bee564144d7b58d57c5b6e85",
+    "https://bcr.bazel.build/modules/bzip2/1.0.8.bcr.1/source.json": "b33d77b53a95b4bbeb9aa0487d0b839ab42cee320b3491c5d9e480b1dd8deaa2",
     "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.2/MODULE.bazel": "bced1551849a5d1ca00b985c0d267ab690af840f04c685f2c62f40e92f66fac0",
-    "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.2/source.json": "0ab7ebbc57f39a7fe96190e01fe9773482bc4e3d465e9cd9b239bb44ad57791d",
+    "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.4/MODULE.bazel": "1aa0bf965abcbf738618b544c704e8eefd7dd12cac8534a6a11419285fe3f236",
+    "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.4/source.json": "6a7ab4645ef66f477f9322cbd71a861e072d2de90adeeda73ab7aad27f848f01",
     "https://bcr.bazel.build/modules/gazelle/0.32.0/MODULE.bazel": "b499f58a5d0d3537f3cf5b76d8ada18242f64ec474d8391247438bf04f58c7b8",
     "https://bcr.bazel.build/modules/gazelle/0.33.0/MODULE.bazel": "a13a0f279b462b784fb8dd52a4074526c4a2afe70e114c7d09066097a46b3350",
     "https://bcr.bazel.build/modules/gazelle/0.34.0/MODULE.bazel": "abdd8ce4d70978933209db92e436deb3a8b737859e9354fb5fd11fb5c2004c8a",
@@ -40,8 +41,8 @@
     "https://bcr.bazel.build/modules/gazelle/0.38.0/source.json": "7fedf9b531bcbbe90b009e4d3aef478a2defb8b8a6e31e931445231e425fc37c",
     "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
     "https://bcr.bazel.build/modules/googletest/1.11.0/source.json": "c73d9ef4268c91bd0c1cd88f1f9dfa08e814b1dbe89b5f594a9f08ba0244d206",
-    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.0/MODULE.bazel": "ea4b3a25a9417a7db57a8a2f9ebdee91d679823c6274b482b817ed128d81c594",
-    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.0/source.json": "9d1df0459caefdf41052d360469922a73e219f67c8ce4da0628cc604469822b9",
+    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.1/MODULE.bazel": "164331a6e73093376a19eaa1eae45a94aad3245e9e79d8f31237f4a8eb6c1c41",
+    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.1/source.json": "a2f67694b91ae575e2715fa2c5745c8c9879e7132852ef45c05b4e25a0d3b423",
     "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5",
     "https://bcr.bazel.build/modules/platforms/0.0.10/source.json": "f22828ff4cf021a6b577f1bf6341cb9dcd7965092a439f64fc1bb3b7a5ae4bd5",
     "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
@@ -55,24 +56,23 @@
     "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
     "https://bcr.bazel.build/modules/protobuf/3.19.2/MODULE.bazel": "532ffe5f2186b69fdde039efe6df13ba726ff338c6bc82275ad433013fa10573",
     "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
-    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.1/MODULE.bazel": "d45e0cac04248d32babf99b96cdb7c82aed6f36657b31647d2e40d45ed262b85",
-    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.1/source.json": "6b6ae325f3e3414d54f1c974ee044d6f49d23ba326b9d702ba7021c9cbda7ce5",
+    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.5/MODULE.bazel": "85336b0606340623321e8427829ef397de5970c2c26e7302d42508e33bc02204",
+    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.5/source.json": "eebd4c50b400450e8ec4b65efa9a2e5b8455666b25e88149a3592dd9f3c4d0c1",
     "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
     "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
     "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
     "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
     "https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430",
-    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.1/MODULE.bazel": "159a59bd049c72ade6f0b617cc06c78ff72ef83dd8e331a038739561e4416e0e",
-    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.6/MODULE.bazel": "d767c0dce8cca10f507ff4df59b6be1023b155e9aa92dc075f564a2ed3713615",
-    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.6/source.json": "5970522e4551e83d36886874b2ff7fc6718884670b6961bcf298aaaa608251c5",
+    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.7/MODULE.bazel": "7ae2696243d059738d8fdf420ae8ebbe29ff6dccbb4a0467d613cd41f57fd02e",
+    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.7/source.json": "c6a9bbdbb6d9326ca0023b1aff251f4b6afe0d37f44708011ce8be55a8da076d",
     "https://bcr.bazel.build/modules/rules_go/0.41.0/MODULE.bazel": "55861d8e8bb0e62cbd2896f60ff303f62ffcb0eddb74ecb0e5c0cbe36fc292c8",
     "https://bcr.bazel.build/modules/rules_go/0.42.0/MODULE.bazel": "8cfa875b9aa8c6fce2b2e5925e73c1388173ea3c32a0db4d2b4804b453c14270",
     "https://bcr.bazel.build/modules/rules_go/0.46.0/MODULE.bazel": "3477df8bdcc49e698b9d25f734c4f3a9f5931ff34ee48a2c662be168f5f2d3fd",
     "https://bcr.bazel.build/modules/rules_go/0.47.0/MODULE.bazel": "e425890d2a4d668abc0f59d8388b70bf63ad025edec76a385c35d85882519417",
     "https://bcr.bazel.build/modules/rules_go/0.49.0/MODULE.bazel": "61cfc1ba17123356d1b12b6c50f6e0162b2cc7fd6f51753c12471e973a0f72a5",
     "https://bcr.bazel.build/modules/rules_go/0.49.0/source.json": "ab2261ea5e29d29a41c8e5c67896f946ab7855b786d28fe25d74987b84e5e85d",
-    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.1/MODULE.bazel": "4bc3bb009698531db230bb85a290355e7805d0cf7b5e8b60f62ee8ac65af0405",
-    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.1/source.json": "cd92050d1eb80a80f1bac8e94ec7d99ffc58e2e6ae2cd18bdcf8efd3e44a2b8f",
+    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.5/MODULE.bazel": "73bd9d7bd8920d8702b18d8f268315c502dcda40159d2982a4a7303cc4027be3",
+    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.5/source.json": "eb1c6423d4eab4675c8c40dd14d48eb55203da27987e6e3db5db705427b1e047",
     "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
     "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86",
     "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1",
@@ -92,22 +92,25 @@
     "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
     "https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014",
     "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
-    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/MODULE.bazel": "0934987548deaa03cca973e6e700d88daadb736d816af5907e93633747c7a9c5",
-    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/source.json": "155e565725363efca12521ef8c30551978c48e6f3b4640fc6796c3dbcae73d81",
-    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.1/MODULE.bazel": "979e286e40ec27423d4c93ff15e3e17b212e8b83b07157d3c61d1f265c4fa16a",
-    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.1/source.json": "26b7181d9581ee3fd407407b695bee7a0d94f2062c1ae1d45529bd12f8e45759",
+    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.5/MODULE.bazel": "697e561dade1d458635ea8a2f2f96382be4dabbcaea2c4d16788913e8fd0bde7",
+    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.5/source.json": "f1055da5fa935d57ab414c609116b4a222198d1f98dc28af67cf3610340199a2",
+    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.6/MODULE.bazel": "e7e8939d113abe75cd176f2a4771220bffbda30484d92962b7912efc9c707d24",
+    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.6/source.json": "84d7f1beedfc4b1596457269890a61f9cceedbb66ef94eb25e4ebff631ab0bd2",
     "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
     "https://bcr.bazel.build/modules/stardoc/0.5.4/MODULE.bazel": "6569966df04610b8520957cb8e97cf2e9faac2c0309657c537ab51c16c18a2a4",
     "https://bcr.bazel.build/modules/stardoc/0.5.4/source.json": "a961f58a71e735aa9dcb2d79b288e06b0a2d860ba730302c8f11be411b76631e",
-    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.12/MODULE.bazel": "947cf935fa609c91b05bd8c8c1be38b9e10b7bc8949cf3092ee416ed30995078",
-    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.12/source.json": "ef45e5e75c03a386bf7a3db5d51071f419442b4cf03f86f2f1b6e25b0ad1071f",
-    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.9/MODULE.bazel": "9a8edfa6905229b899225489cbd6db36f073d9455c77238bd6ae6c52da5256d8",
+    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.17/MODULE.bazel": "cde98816e2c0ce65b29b1f3a43412ef0d9d6d82fe285f98fed111623f82d7f12",
+    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.17/source.json": "92ce5f97add93cd1b534151a38cef7cede92462439ebe559bba1681bdf4241f9",
     "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
     "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459",
+    "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/MODULE.bazel": "2cbf58a2875e7f23ab77073902e009bfce25481fac231f950b89d57d441d5ef3",
+    "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5",
     "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
     "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
     "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d"
+    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d",
+    "https://bcr.bazel.build/modules/zstd/1.5.6/MODULE.bazel": "471ebe7d3cdd8c6469390fcf623eb4779ff55fbee0a87f1dc57a1def468b96d4",
+    "https://bcr.bazel.build/modules/zstd/1.5.6/source.json": "02010c3333fc89b44fe861db049968decb6e688411f7f9d4f6791d74f9adfb51"
   },
   "selectedYankedVersions": {},
   "moduleExtensions": {
diff --git a/e2e/.bazelrc.ci b/e2e/.bazelrc.ci
index 679a169bbaee46edc2bf106ead37db831230a6fb..ea22151ecc9fe6d2ad2b134ca9a08487ab920f17 100644
--- a/e2e/.bazelrc.ci
+++ b/e2e/.bazelrc.ci
@@ -26,7 +26,7 @@ test --test_output=errors
 test --test_verbose_timeout_warnings
 
 # Validate that the lockfile is correct
-common --lockfile_mode=error
+common --lockfile_mode=${CI_LOCKFILE_MODE}
 
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
diff --git a/e2e/MODULE.bazel b/e2e/MODULE.bazel
index 7f34dd9090c0c27fc475c79fa5e91850ce78d345..f3bdc1f53bbed6dd1d446d7563b725ae33cb7da7 100644
--- a/e2e/MODULE.bazel
+++ b/e2e/MODULE.bazel
@@ -5,13 +5,13 @@ module(
     ],
 )
 
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.12")
-bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.6")
-bazel_dep(name = "rules_diff", version = "1.0.0-beta.4")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.17")
+bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.7")
+bazel_dep(name = "rules_diff", version = "1.0.0-beta.5")
 bazel_dep(name = "rules_tar")
 local_path_override(
     module_name = "rules_tar",
     path = "..",
 )
 
-bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0", dev_dependency = True)
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.1", dev_dependency = True)
diff --git a/e2e/MODULE.bazel.lock b/e2e/MODULE.bazel.lock
index a29ab9eb9e1015ff942fd18588360b2c931222b5..657a8ad13188fb1e0dc9a20c5a2cdbe67749c5dd 100644
--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
@@ -5,10 +5,8 @@
     "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
     "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
     "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/source.json": "7e3a9adf473e9af076ae485ed649d5641ad50ec5c11718103f34de03170d94ad",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.12/MODULE.bazel": "e75be27b37a2f7cf83dbeb497aeac93f8da9aa55fc2b35a9a1cb46db9b7f8885",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.12/source.json": "4b9e00b30d41ff209d7deddba1fbb4538cdfc7a54b4e07e607134ccc147e6a29",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.6/MODULE.bazel": "247bcdbc358206c37ce8bf1c850115002c6560570d96f9ac8a79dd810b18ea85",
-    "https://bcr.bazel.build/modules/ape/1.0.0-beta.7/MODULE.bazel": "cb8163d01ede65cb41bf1449d6e5091e6da8d927cf700103d9a0c48517f3c1bf",
+    "https://bcr.bazel.build/modules/ape/1.0.0-beta.14/MODULE.bazel": "a57aea83a0c957cbe3caf0dbec6eb85c0a9eb9dfa99808a197a8ae11a50bc565",
+    "https://bcr.bazel.build/modules/ape/1.0.0-beta.14/source.json": "e1f55124e33498466e3ff43a15f9272e3204d7816ee81510b67a0fdc6bcb2574",
     "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
     "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
     "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.0/MODULE.bazel": "2ee4360a135da51ec06ca49cc4310f5a4c2839118f38ea8417f7f2db56967285",
@@ -30,8 +28,11 @@
     "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
+    "https://bcr.bazel.build/modules/bzip2/1.0.8.bcr.1/MODULE.bazel": "8ec3d613ef3f5572302daa08c7f68f34795cafe9bee564144d7b58d57c5b6e85",
+    "https://bcr.bazel.build/modules/bzip2/1.0.8.bcr.1/source.json": "b33d77b53a95b4bbeb9aa0487d0b839ab42cee320b3491c5d9e480b1dd8deaa2",
     "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.2/MODULE.bazel": "bced1551849a5d1ca00b985c0d267ab690af840f04c685f2c62f40e92f66fac0",
-    "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.2/source.json": "0ab7ebbc57f39a7fe96190e01fe9773482bc4e3d465e9cd9b239bb44ad57791d",
+    "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.4/MODULE.bazel": "1aa0bf965abcbf738618b544c704e8eefd7dd12cac8534a6a11419285fe3f236",
+    "https://bcr.bazel.build/modules/download_utils/1.0.0-beta.4/source.json": "6a7ab4645ef66f477f9322cbd71a861e072d2de90adeeda73ab7aad27f848f01",
     "https://bcr.bazel.build/modules/gazelle/0.32.0/MODULE.bazel": "b499f58a5d0d3537f3cf5b76d8ada18242f64ec474d8391247438bf04f58c7b8",
     "https://bcr.bazel.build/modules/gazelle/0.33.0/MODULE.bazel": "a13a0f279b462b784fb8dd52a4074526c4a2afe70e114c7d09066097a46b3350",
     "https://bcr.bazel.build/modules/gazelle/0.34.0/MODULE.bazel": "abdd8ce4d70978933209db92e436deb3a8b737859e9354fb5fd11fb5c2004c8a",
@@ -40,8 +41,8 @@
     "https://bcr.bazel.build/modules/gazelle/0.38.0/source.json": "7fedf9b531bcbbe90b009e4d3aef478a2defb8b8a6e31e931445231e425fc37c",
     "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
     "https://bcr.bazel.build/modules/googletest/1.11.0/source.json": "c73d9ef4268c91bd0c1cd88f1f9dfa08e814b1dbe89b5f594a9f08ba0244d206",
-    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.0/MODULE.bazel": "ea4b3a25a9417a7db57a8a2f9ebdee91d679823c6274b482b817ed128d81c594",
-    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.0/source.json": "9d1df0459caefdf41052d360469922a73e219f67c8ce4da0628cc604469822b9",
+    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.1/MODULE.bazel": "164331a6e73093376a19eaa1eae45a94aad3245e9e79d8f31237f4a8eb6c1c41",
+    "https://bcr.bazel.build/modules/hermetic_cc_toolchain/3.1.1/source.json": "a2f67694b91ae575e2715fa2c5745c8c9879e7132852ef45c05b4e25a0d3b423",
     "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5",
     "https://bcr.bazel.build/modules/platforms/0.0.10/source.json": "f22828ff4cf021a6b577f1bf6341cb9dcd7965092a439f64fc1bb3b7a5ae4bd5",
     "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
@@ -55,26 +56,25 @@
     "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
     "https://bcr.bazel.build/modules/protobuf/3.19.2/MODULE.bazel": "532ffe5f2186b69fdde039efe6df13ba726ff338c6bc82275ad433013fa10573",
     "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
-    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.1/MODULE.bazel": "d45e0cac04248d32babf99b96cdb7c82aed6f36657b31647d2e40d45ed262b85",
-    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.1/source.json": "6b6ae325f3e3414d54f1c974ee044d6f49d23ba326b9d702ba7021c9cbda7ce5",
+    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.5/MODULE.bazel": "85336b0606340623321e8427829ef397de5970c2c26e7302d42508e33bc02204",
+    "https://bcr.bazel.build/modules/rules_bzip2/1.0.0-beta.5/source.json": "eebd4c50b400450e8ec4b65efa9a2e5b8455666b25e88149a3592dd9f3c4d0c1",
     "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
     "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
     "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
     "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
     "https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430",
-    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.1/MODULE.bazel": "159a59bd049c72ade6f0b617cc06c78ff72ef83dd8e331a038739561e4416e0e",
-    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.6/MODULE.bazel": "d767c0dce8cca10f507ff4df59b6be1023b155e9aa92dc075f564a2ed3713615",
-    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.6/source.json": "5970522e4551e83d36886874b2ff7fc6718884670b6961bcf298aaaa608251c5",
-    "https://bcr.bazel.build/modules/rules_diff/1.0.0-beta.4/MODULE.bazel": "329d29a12ae8e4b2cfac5b3d9c25a7a3effc3f2dd3ccc15ae21926a1aaf655fc",
-    "https://bcr.bazel.build/modules/rules_diff/1.0.0-beta.4/source.json": "ec721689f41990897da4cd4f7540bafdad93bb9443e213c52d6850f17b088224",
+    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.7/MODULE.bazel": "7ae2696243d059738d8fdf420ae8ebbe29ff6dccbb4a0467d613cd41f57fd02e",
+    "https://bcr.bazel.build/modules/rules_coreutils/1.0.0-beta.7/source.json": "c6a9bbdbb6d9326ca0023b1aff251f4b6afe0d37f44708011ce8be55a8da076d",
+    "https://bcr.bazel.build/modules/rules_diff/1.0.0-beta.5/MODULE.bazel": "9fed09758683312afc4addac83ba57eab2d36e9ee0c48ee943106c175d2b14eb",
+    "https://bcr.bazel.build/modules/rules_diff/1.0.0-beta.5/source.json": "9ec01976a05448307ef82e76078f0ff8fdb497d4cf727ae200a234493e582522",
     "https://bcr.bazel.build/modules/rules_go/0.41.0/MODULE.bazel": "55861d8e8bb0e62cbd2896f60ff303f62ffcb0eddb74ecb0e5c0cbe36fc292c8",
     "https://bcr.bazel.build/modules/rules_go/0.42.0/MODULE.bazel": "8cfa875b9aa8c6fce2b2e5925e73c1388173ea3c32a0db4d2b4804b453c14270",
     "https://bcr.bazel.build/modules/rules_go/0.46.0/MODULE.bazel": "3477df8bdcc49e698b9d25f734c4f3a9f5931ff34ee48a2c662be168f5f2d3fd",
     "https://bcr.bazel.build/modules/rules_go/0.47.0/MODULE.bazel": "e425890d2a4d668abc0f59d8388b70bf63ad025edec76a385c35d85882519417",
     "https://bcr.bazel.build/modules/rules_go/0.49.0/MODULE.bazel": "61cfc1ba17123356d1b12b6c50f6e0162b2cc7fd6f51753c12471e973a0f72a5",
     "https://bcr.bazel.build/modules/rules_go/0.49.0/source.json": "ab2261ea5e29d29a41c8e5c67896f946ab7855b786d28fe25d74987b84e5e85d",
-    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.1/MODULE.bazel": "4bc3bb009698531db230bb85a290355e7805d0cf7b5e8b60f62ee8ac65af0405",
-    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.1/source.json": "cd92050d1eb80a80f1bac8e94ec7d99ffc58e2e6ae2cd18bdcf8efd3e44a2b8f",
+    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.5/MODULE.bazel": "73bd9d7bd8920d8702b18d8f268315c502dcda40159d2982a4a7303cc4027be3",
+    "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.5/source.json": "eb1c6423d4eab4675c8c40dd14d48eb55203da27987e6e3db5db705427b1e047",
     "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
     "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86",
     "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1",
@@ -94,22 +94,25 @@
     "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
     "https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014",
     "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
-    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/MODULE.bazel": "0934987548deaa03cca973e6e700d88daadb736d816af5907e93633747c7a9c5",
-    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/source.json": "155e565725363efca12521ef8c30551978c48e6f3b4640fc6796c3dbcae73d81",
-    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.1/MODULE.bazel": "979e286e40ec27423d4c93ff15e3e17b212e8b83b07157d3c61d1f265c4fa16a",
-    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.1/source.json": "26b7181d9581ee3fd407407b695bee7a0d94f2062c1ae1d45529bd12f8e45759",
+    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.5/MODULE.bazel": "697e561dade1d458635ea8a2f2f96382be4dabbcaea2c4d16788913e8fd0bde7",
+    "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.5/source.json": "f1055da5fa935d57ab414c609116b4a222198d1f98dc28af67cf3610340199a2",
+    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.6/MODULE.bazel": "e7e8939d113abe75cd176f2a4771220bffbda30484d92962b7912efc9c707d24",
+    "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.6/source.json": "84d7f1beedfc4b1596457269890a61f9cceedbb66ef94eb25e4ebff631ab0bd2",
     "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
     "https://bcr.bazel.build/modules/stardoc/0.5.4/MODULE.bazel": "6569966df04610b8520957cb8e97cf2e9faac2c0309657c537ab51c16c18a2a4",
     "https://bcr.bazel.build/modules/stardoc/0.5.4/source.json": "a961f58a71e735aa9dcb2d79b288e06b0a2d860ba730302c8f11be411b76631e",
-    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.12/MODULE.bazel": "947cf935fa609c91b05bd8c8c1be38b9e10b7bc8949cf3092ee416ed30995078",
-    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.12/source.json": "ef45e5e75c03a386bf7a3db5d51071f419442b4cf03f86f2f1b6e25b0ad1071f",
-    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.9/MODULE.bazel": "9a8edfa6905229b899225489cbd6db36f073d9455c77238bd6ae6c52da5256d8",
+    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.17/MODULE.bazel": "cde98816e2c0ce65b29b1f3a43412ef0d9d6d82fe285f98fed111623f82d7f12",
+    "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.17/source.json": "92ce5f97add93cd1b534151a38cef7cede92462439ebe559bba1681bdf4241f9",
     "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
     "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459",
+    "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/MODULE.bazel": "2cbf58a2875e7f23ab77073902e009bfce25481fac231f950b89d57d441d5ef3",
+    "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5",
     "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
     "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
     "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d"
+    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d",
+    "https://bcr.bazel.build/modules/zstd/1.5.6/MODULE.bazel": "471ebe7d3cdd8c6469390fcf623eb4779ff55fbee0a87f1dc57a1def468b96d4",
+    "https://bcr.bazel.build/modules/zstd/1.5.6/source.json": "02010c3333fc89b44fe861db049968decb6e688411f7f9d4f6791d74f9adfb51"
   },
   "selectedYankedVersions": {},
   "moduleExtensions": {