diff --git a/.bazelrc b/.bazelrc
index caf256cf64625814d29734cc65144cd5e24d06f7..31d7aa52da53e38b2619fdcd649f05096ecb0718 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -10,5 +10,8 @@ build --nolegacy_external_runfiles
 # Avoid building all targets when testing
 test --build_tests_only
 
+# Print relative paths where possible to reduce noise
+common --attempt_to_print_relative_paths
+
 # User-specific .bazelrc
 try-import %workspace%/.bazelrc.user
diff --git a/.bazelrc.ci b/.bazelrc.ci
index 045e1ab1e0d57d974076bb974db10cb89536a112..679a169bbaee46edc2bf106ead37db831230a6fb 100644
--- a/.bazelrc.ci
+++ b/.bazelrc.ci
@@ -16,9 +16,6 @@ common --show_timestamps
 # Do not wrap any output
 common --terminal_columns=0
 
-# Print relative paths where possible to reduce noise
-common --attempt_to_print_relative_paths
-
 # Output as much information in the CI log about failures as possible
 build --verbose_failures
 
@@ -28,6 +25,9 @@ test --test_output=errors
 # Output as much information when a test exceeds a timeout
 test --test_verbose_timeout_warnings
 
+# Validate that the lockfile is correct
+common --lockfile_mode=error
+
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
 build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
@@ -60,5 +60,5 @@ build:remote --experimental_profile_include_primary_output
 # Eliminate duplicate references in the Build Event Stream
 build:remote --nolegacy_important_outputs
 
-# TODO: remove this when `bazel/ape` binaries work on remote execution `arm64` instances
-build:remote --host_platform=@toolchain_utils//toolchain/platform:amd64-linux-gnu
+# Describe remote executors
+build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33095a53bd36b09cb533a8c54a8d407bd845370b..331b53206bac2f879b0eb3f23952868b95cb84e7 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.3"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.4"
     inputs:
       variables: |
         CI_PROJECT_DIR
@@ -21,6 +21,12 @@ default:
 
 test:
   extends: .bazelisk
+  cache:
+    - !reference [.bazelisk, cache]
+    - key: "bazel-cache-${CI_PROJECT_ID}"
+      paths:
+      - ".cache/bazel/disk"
+      - ".cache/bazel/repo"
   parallel:
     matrix:
       - ROOT:
diff --git a/ape/assimilate/rule.bzl b/ape/assimilate/rule.bzl
index 03b3f08f4ba5638eec6d3a3681eedb8486df209a..b5e8916bfcb38c912d139f3c3d6ea1ff233b5d46 100644
--- a/ape/assimilate/rule.bzl
+++ b/ape/assimilate/rule.bzl
@@ -104,7 +104,7 @@ def _assimilate(ctx, executable):
         arguments = [args],
         mnemonic = "ApeAssimilate",
         progress_message = "assimilating %{input}",
-        toolchain = "//ape/toolchain/assimilate:type",
+        toolchain = "//ape/toolchain/ape:type",
     )
 
     return ctx.runfiles([executable])
diff --git a/e2e/.bazelrc b/e2e/.bazelrc
index caf256cf64625814d29734cc65144cd5e24d06f7..31d7aa52da53e38b2619fdcd649f05096ecb0718 100644
--- a/e2e/.bazelrc
+++ b/e2e/.bazelrc
@@ -10,5 +10,8 @@ build --nolegacy_external_runfiles
 # Avoid building all targets when testing
 test --build_tests_only
 
+# Print relative paths where possible to reduce noise
+common --attempt_to_print_relative_paths
+
 # User-specific .bazelrc
 try-import %workspace%/.bazelrc.user
diff --git a/e2e/.bazelrc.ci b/e2e/.bazelrc.ci
index 045e1ab1e0d57d974076bb974db10cb89536a112..679a169bbaee46edc2bf106ead37db831230a6fb 100644
--- a/e2e/.bazelrc.ci
+++ b/e2e/.bazelrc.ci
@@ -16,9 +16,6 @@ common --show_timestamps
 # Do not wrap any output
 common --terminal_columns=0
 
-# Print relative paths where possible to reduce noise
-common --attempt_to_print_relative_paths
-
 # Output as much information in the CI log about failures as possible
 build --verbose_failures
 
@@ -28,6 +25,9 @@ test --test_output=errors
 # Output as much information when a test exceeds a timeout
 test --test_verbose_timeout_warnings
 
+# Validate that the lockfile is correct
+common --lockfile_mode=error
+
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
 build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
@@ -60,5 +60,5 @@ build:remote --experimental_profile_include_primary_output
 # Eliminate duplicate references in the Build Event Stream
 build:remote --nolegacy_important_outputs
 
-# TODO: remove this when `bazel/ape` binaries work on remote execution `arm64` instances
-build:remote --host_platform=@toolchain_utils//toolchain/platform:amd64-linux-gnu
+# Describe remote executors
+build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu