diff --git a/.azure-pipelines/bazel.yml b/.azure-pipelines/bazel.yml
index 85fe5eb2208d9..bba3dcd3ada2f 100644
--- a/.azure-pipelines/bazel.yml
+++ b/.azure-pipelines/bazel.yml
@@ -29,7 +29,9 @@ steps:
     env:
       ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
       ENVOY_RBE: "true"
-      BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) --curses=no"
+      # Use https://docs.bazel.build/versions/master/command-line-reference.html#flag--experimental_repository_cache_hardlinks
+      # to save disk space.
+      BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) --curses=no --experimental_repository_cache_hardlinks"
       BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
       BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
       GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index d7dc39808c111..2fd567047741d 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -58,6 +58,10 @@ function cp_binary_for_image_build() {
 
   # Copy for azp which doesn't preserve permissions, creating a tar archive
   tar czf "${ENVOY_BUILD_DIR}"/envoy_binary.tar.gz -C "${ENVOY_SRCDIR}" build_"$1" build_"$1"_stripped
+
+  # Remove binaries to save space, only if BUILD_REASON exists (running in AZP)
+  [[ -z "${BUILD_REASON}" ]] || \
+    rm -rf "${ENVOY_SRCDIR}"/build_"$1" "${ENVOY_SRCDIR}"/build_"$1"_stripped "${ENVOY_DELIVERY_DIR}"/envoy
 }
 
 function bazel_binary_build() {
diff --git a/test/integration/BUILD b/test/integration/BUILD
index 6411a61e9585b..08fa63ab1df56 100644
--- a/test/integration/BUILD
+++ b/test/integration/BUILD
@@ -633,8 +633,9 @@ envoy_cc_test(
     srcs = [
         "echo_integration_test.cc",
     ],
-    # This test must be run in exclusive mode: see comments in AddRemoveListener
-    tags = ["exclusive"],
+    # Uncomment this line to run this test repeatedly in exclusive mode if not using docker-sandbox,
+    # or RBE, see comments in AddRemoveListener.
+    # tags = ["exclusive"],
     deps = [
         ":integration_lib",
         "//source/extensions/filters/network/echo:config",