diff --git a/.bazelrc b/.bazelrc
index 413cee3b0..4b85c0c94 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -21,7 +21,12 @@ build --cxxopt=-std=c++17
 # Display the current git revision in the info block.
 build --stamp --workspace_status_command tools/workspace_status.sh
 
+# Set flags for x86_64.
+build:x86_64 --crosstool_top=@crosstool//:toolchains
+build:x86_64 --cpu=k8
+build:x86_64 --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
 # Set flags for aarch64.
-build:cross-aarch64 --crosstool_top=@crosstool//:toolchains --compiler=gcc
-build:cross-aarch64 --cpu=aarch64
-build:cross-aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64
+build:aarch64 --crosstool_top=@crosstool//:toolchains
+build:aarch64 --cpu=aarch64
+build:aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index cd7881432..052ffa30c 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -97,8 +97,8 @@ steps:
   - <<: *common
     label: ":ship: Release tests"
     commands:
-      - make artifacts/x86_64
-      - make BAZEL_OPTIONS=--config=cross-aarch64 artifacts/aarch64
+      - make BAZEL_OPTIONS=--config=x86_64 artifacts/x86_64
+      - make BAZEL_OPTIONS=--config=aarch64 artifacts/aarch64
       - make release
 
   # Images tests.
diff --git a/.buildkite/release.yaml b/.buildkite/release.yaml
index 91e4aeb6d..b2d4f4023 100644
--- a/.buildkite/release.yaml
+++ b/.buildkite/release.yaml
@@ -17,7 +17,7 @@ steps:
   - <<: *common
     label: ":ship: Push all images (x86_64)"
     commands:
-      - make push-all-images
+      - make ARCH=x86_64 push-all-images
   - <<: *common
     label: ":ship: Push all images (aarch64)"
     commands:
@@ -25,11 +25,12 @@ steps:
   - <<: *common
     label: ":ship: Release"
     commands:
-      - make artifacts/x86_64
-      - make BAZEL_OPTIONS=--config=cross-aarch64 artifacts/aarch64
+      - make BAZEL_OPTIONS=--config=x86_64 artifacts/x86_64
+      - make BAZEL_OPTIONS=--config=aarch64 artifacts/aarch64
       - make release RELEASE_NIGHTLY=$$RELEASE_NIGHTLY
       - cd repo && gsutil cp -r . gs://gvisor/releases/
   - <<: *common
     label: ":ship: Website Deploy"
     commands:
-      - make website-deploy
+      # The built website image must be x86_64.
+      - make BAZEL_OPTIONS=--config=x86_64 website-deploy
diff --git a/Makefile b/Makefile
index be5b79ed4..40f105a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -240,7 +240,7 @@ do-tests: $(RUNTIME_BIN)
 	@sudo $(RUNTIME_BIN) do true
 .PHONY: do-tests
 
-arm-qemu-smoke-test: BAZEL_OPTIONS=--config=cross-aarch64
+arm-qemu-smoke-test: BAZEL_OPTIONS=--config=aarch64
 arm-qemu-smoke-test: $(RUNTIME_BIN) load-arm-qemu
 	export T=$$(mktemp -d --tmpdir release.XXXXXX); \
 	mkdir -p $$T/bin/arm64/ && \