diff --git a/system-test/performance-testcases/aws-cpu-only-perf-10-node.yml b/system-test/performance-testcases/aws-cpu-only-perf-10-node.yml
index 979393274e..a3ff253514 100755
--- a/system-test/performance-testcases/aws-cpu-only-perf-10-node.yml
+++ b/system-test/performance-testcases/aws-cpu-only-perf-10-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=aws-deploy"
diff --git a/system-test/performance-testcases/aws-cpu-only-perf-5-node.yml b/system-test/performance-testcases/aws-cpu-only-perf-5-node.yml
index 749c9fa12c..dff96df0d8 100755
--- a/system-test/performance-testcases/aws-cpu-only-perf-5-node.yml
+++ b/system-test/performance-testcases/aws-cpu-only-perf-5-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=aws-deploy"
diff --git a/system-test/performance-testcases/azure-cpu-only-perf-5-node.yml b/system-test/performance-testcases/azure-cpu-only-perf-5-node.yml
index 3c3efb82e6..23e220f31e 100755
--- a/system-test/performance-testcases/azure-cpu-only-perf-5-node.yml
+++ b/system-test/performance-testcases/azure-cpu-only-perf-5-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=azure-deploy"
diff --git a/system-test/performance-testcases/gce-cpu-only-perf-10-node.yml b/system-test/performance-testcases/gce-cpu-only-perf-10-node.yml
index 1f90cdde72..85efd53225 100755
--- a/system-test/performance-testcases/gce-cpu-only-perf-10-node.yml
+++ b/system-test/performance-testcases/gce-cpu-only-perf-10-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: ""
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-cpu-only-perf-5-node.yml b/system-test/performance-testcases/gce-cpu-only-perf-5-node.yml
index 7d3021f43a..17ae4772a8 100755
--- a/system-test/performance-testcases/gce-cpu-only-perf-5-node.yml
+++ b/system-test/performance-testcases/gce-cpu-only-perf-5-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-10-node.yml b/system-test/performance-testcases/gce-gpu-perf-10-node.yml
index 77fc80bfe1..6dbee775c1 100755
--- a/system-test/performance-testcases/gce-gpu-perf-10-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-10-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-100-node.yml b/system-test/performance-testcases/gce-gpu-perf-100-node.yml
index 3179e7f31e..08f652dbc0 100755
--- a/system-test/performance-testcases/gce-gpu-perf-100-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-100-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-25-node.yml b/system-test/performance-testcases/gce-gpu-perf-25-node.yml
index 40ba27e5a2..778d6df5e4 100755
--- a/system-test/performance-testcases/gce-gpu-perf-25-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-25-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-5-node.yml b/system-test/performance-testcases/gce-gpu-perf-5-node.yml
index 185dfba2f0..7001297e86 100755
--- a/system-test/performance-testcases/gce-gpu-perf-5-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-5-node.yml
@@ -16,4 +16,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/performance-testcases/gce-gpu-perf-50-node.yml b/system-test/performance-testcases/gce-gpu-perf-50-node.yml
index 47dd17042a..a12be8d2ea 100755
--- a/system-test/performance-testcases/gce-gpu-perf-50-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-50-node.yml
@@ -17,4 +17,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=gce-deploy"
diff --git a/system-test/stability-testcases/gce-stability-5-node.yml b/system-test/stability-testcases/gce-stability-5-node.yml
index 5690555060..cc9bc7f78e 100755
--- a/system-test/stability-testcases/gce-stability-5-node.yml
+++ b/system-test/stability-testcases/gce-stability-5-node.yml
@@ -15,4 +15,4 @@ steps:
       USE_PUBLIC_IP_ADDRESSES: "true"
       ADDITIONAL_FLAGS: "--dedicated"
     agents:
-      - "queue=testnet-deploy"
+      - "queue=stability-deploy"
diff --git a/system-test/testnet-automation.sh b/system-test/testnet-automation.sh
index 3171a2e7be..bbed4c4e68 100755
--- a/system-test/testnet-automation.sh
+++ b/system-test/testnet-automation.sh
@@ -87,63 +87,8 @@ $(eval echo "$@")"
   )
 
   execution_step "Deleting Testnet"
-  case $CLOUD_PROVIDER in
-  gce)
-  (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
+  net/"${CLOUD_PROVIDER}".sh delete -p "${TESTNET_TAG}"
 
-- command: "net/gce.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=testnet-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  ec2)
-  (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/ec2.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=testnet-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  azure)
-  (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/azure.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=testnet-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  colo)
-    (
-    cat <<EOF
-- wait: ~
-  continue_on_failure: true
-
-- command: "net/colo.sh delete -p ${TESTNET_TAG}"
-  label: "Delete Testnet"
-  agents:
-    - "queue=colo-deploy"
-EOF
-  ) | buildkite-agent pipeline upload
-  ;;
-  *)
-    echo "Error: Unsupported cloud provider: $CLOUD_PROVIDER"
-    ;;
-  esac
 }
 trap 'cleanup_testnet $BASH_COMMAND' EXIT