diff --git a/.buildkite/models/meta-llama_Llama-Guard-4-12B.yml b/.buildkite/models/meta-llama_Llama-Guard-4-12B.yml
index 33efed0d0..030b57fd1 100644
--- a/.buildkite/models/meta-llama_Llama-Guard-4-12B.yml
+++ b/.buildkite/models/meta-llama_Llama-Guard-4-12B.yml
@@ -15,6 +15,7 @@ steps:
     env:
       CI_STAGE: "UnitTest"
       CI_TARGET: meta-llama/Llama-Guard-4-12B
+      CI_CATEGORY: "text-only"
     agents:
       queue: cpu
     commands:
@@ -40,6 +41,7 @@ steps:
     env:
       CI_TARGET: meta-llama/Llama-Guard-4-12B
       CI_STAGE: "IntegrationTest"
+      CI_CATEGORY: "text-only"
     agents:
       queue: cpu
     commands:
@@ -62,6 +64,7 @@ steps:
     env:
       CI_TARGET: meta-llama/Llama-Guard-4-12B
       CI_STAGE: "Benchmark"
+      CI_CATEGORY: "text-only"
     agents:
       queue: cpu
     commands:
diff --git a/.buildkite/scripts/bootstrap.sh b/.buildkite/scripts/bootstrap.sh
index f71208f14..b51b7b634 100755
--- a/.buildkite/scripts/bootstrap.sh
+++ b/.buildkite/scripts/bootstrap.sh
@@ -24,10 +24,11 @@ upload_pipeline() {
     VLLM_COMMIT_HASH=$(git ls-remote https://github.com/vllm-project/vllm.git HEAD | awk '{ print $1}')
     buildkite-agent meta-data set "VLLM_COMMIT_HASH" "${VLLM_COMMIT_HASH}"
     echo "Using vllm commit hash: $(buildkite-agent meta-data get "VLLM_COMMIT_HASH")"
-    buildkite-agent pipeline upload .buildkite/pipeline_jax.yml
+    # buildkite-agent pipeline upload .buildkite/pipeline_jax.yml
+    buildkite-agent pipeline upload .buildkite/models/meta-llama_Llama-Guard-4-12B.yml
     # buildkite-agent pipeline upload .buildkite/pipeline_torch.yml
-    buildkite-agent pipeline upload .buildkite/main.yml
-    buildkite-agent pipeline upload .buildkite/nightly_releases.yml
+    # buildkite-agent pipeline upload .buildkite/main.yml
+    # buildkite-agent pipeline upload .buildkite/nightly_releases.yml
 }
 
 echo "--- Starting Buildkite Bootstrap ---"
diff --git a/tests/e2e/benchmarking/safety_model_benchmark.sh b/tests/e2e/benchmarking/safety_model_benchmark.sh
index c78e3231e..ae41e6162 100644
--- a/tests/e2e/benchmarking/safety_model_benchmark.sh
+++ b/tests/e2e/benchmarking/safety_model_benchmark.sh
@@ -132,8 +132,7 @@ fi
 run_accuracy_check() {
     echo -e "\n--- Running Accuracy Check (Mode: ACCURACY) ---"
 
-    CONFTEST_DIR="/workspace/tpu-inference/scripts/vllm/integration"
-    CONFTEST_DIR="/mnt/disks/jiries-disk_data/tpu-inference/scripts/vllm/integration"
+    CONFTEST_DIR="/workspace/tpu_inference/scripts/vllm/integration"
 
     RELATIVE_TEST_FILE="test_safety_model_accuracy.py"
 
@@ -146,8 +145,6 @@ run_accuracy_check() {
             --model-name="$MODEL_NAME" \
             --expected-value="$MINIMUM_ACCURACY_THRESHOLD" \
             --dataset-path="$LOCAL_CSV_FILE"
-
-        return $?
     )
     return $?
 }