diff --git a/projects/istio/build.sh b/projects/istio/build.sh
index 2ec972309..57f425ff6 100644
--- a/projects/istio/build.sh
+++ b/projects/istio/build.sh
@@ -15,5 +15,13 @@
 #
 ################################################################################
 
-$SRC/istio/tests/fuzz/oss_fuzz_build.sh
+if [ -n "${OSS_FUZZ_CI-}" ]
+then
+	echo "Skipping most fuzzers since the OSS-fuzz CI may fail from running out of disk space."
+	mv ./tests/fuzz/kube_gateway_controller_fuzzer.go ./pilot/pkg/config/kube/gateway/
+	compile_go_fuzzer istio.io/istio/pilot/pkg/config/kube/gateway ConvertResourcesFuzz fuzz_convert_resources
+else
+	$SRC/istio/tests/fuzz/oss_fuzz_build.sh
+fi
+