diff --git a/jenkins/gerrit-bazel-build.sh b/jenkins/gerrit-bazel-build.sh
index 0c17ff1..cfb76eb 100644
--- a/jenkins/gerrit-bazel-build.sh
+++ b/jenkins/gerrit-bazel-build.sh
@@ -5,7 +5,7 @@
   cd gerrit
   . set-java.sh 8
 
-  export BAZEL_OPTS=--ignore_unsupported_sandboxing
+  export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone"
 
   bazel build $BAZEL_OPTS \
         gerrit-plugin-api:plugin-api_deploy.jar \
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index eec01f2..5da248f 100644
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -4,7 +4,8 @@
 then
   cd gerrit
 
-  export BAZEL_OPTS="--ignore_unsupported_sandboxing --test_output errors \
+  export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
+                     --test_output errors \
                      --test_summary detailed --flaky_test_attempts 3 \
                      --test_verbose_timeout_warnings --build_tests_only \
                      --nocache_test_results \
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 3332b30..b96627f 100644
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -16,7 +16,8 @@
 
   if [ "$MODE" == "default" ] || [ "$MODE" == "notedb" ]
   then
-    export BAZEL_OPTS="--ignore_unsupported_sandboxing --test_output errors \
+    export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
+                     --test_output errors \
                      --test_summary detailed --flaky_test_attempts 3 \
                      --test_verbose_timeout_warnings --build_tests_only \
                      --nocache_test_results \