diff --git a/system-test/deprecated-testcases/gce-gpu-perf-100-node.yml b/system-test/deprecated-testcases/gce-gpu-perf-100-node.yml
index 0fe9a1cfa7..6c3c22aef3 100755
--- a/system-test/deprecated-testcases/gce-gpu-perf-100-node.yml
+++ b/system-test/deprecated-testcases/gce-gpu-perf-100-node.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 100
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 2
       CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/partition-testcases/gce-5-node-3-partition.yml b/system-test/partition-testcases/gce-5-node-3-partition.yml
index bbae390195..62dbc3a5f6 100755
--- a/system-test/partition-testcases/gce-5-node-3-partition.yml
+++ b/system-test/partition-testcases/gce-5-node-3-partition.yml
@@ -8,7 +8,7 @@ steps:
       TESTNET_TAG: "gce-perf-cpu-only"
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
diff --git a/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml b/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml
index 0c62c9f8de..75bbf576d7 100755
--- a/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml
+++ b/system-test/partition-testcases/gce-5-node-single-region-2-partitions.yml
@@ -8,7 +8,7 @@ steps:
       TESTNET_TAG: "gce-perf-cpu-only"
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 5000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
diff --git a/system-test/partition-testcases/gce-partition-once-then-stabilize.yml b/system-test/partition-testcases/gce-partition-once-then-stabilize.yml
index ec435def2c..a0f197cbe3 100755
--- a/system-test/partition-testcases/gce-partition-once-then-stabilize.yml
+++ b/system-test/partition-testcases/gce-partition-once-then-stabilize.yml
@@ -8,7 +8,7 @@ steps:
       TESTNET_TAG: "gce-perf-cpu-only"
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
diff --git a/system-test/partition-testcases/gce-partition-recovery.yml b/system-test/partition-testcases/gce-partition-recovery.yml
index f0c1630cb7..a2b2b4fd94 100755
--- a/system-test/partition-testcases/gce-partition-recovery.yml
+++ b/system-test/partition-testcases/gce-partition-recovery.yml
@@ -7,7 +7,7 @@ steps:
       CLOUD_PROVIDER: "gce"
       ENABLE_GPU: "false"
       NUMBER_OF_VALIDATOR_NODES: 9
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       ADDITIONAL_FLAGS: "--dedicated"
       SKIP_PERF_RESULTS: "true"
diff --git a/system-test/partition-testcases/gce-partition-with-offline.yml b/system-test/partition-testcases/gce-partition-with-offline.yml
index 982481a897..896d553d00 100755
--- a/system-test/partition-testcases/gce-partition-with-offline.yml
+++ b/system-test/partition-testcases/gce-partition-with-offline.yml
@@ -8,7 +8,7 @@ steps:
       TESTNET_TAG: "gce-perf-cpu-only"
       NUMBER_OF_VALIDATOR_NODES: 4
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
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 bb8c8a795a..c8d3677164 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
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 10
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/performance-testcases/gce-cpu-only-perf-5-node-single-region.yml b/system-test/performance-testcases/gce-cpu-only-perf-5-node-single-region.yml
index 388ddba62f..79f43abfd3 100755
--- a/system-test/performance-testcases/gce-cpu-only-perf-5-node-single-region.yml
+++ b/system-test/performance-testcases/gce-cpu-only-perf-5-node-single-region.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
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 f0ece2fd67..6448942f57 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
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/performance-testcases/gce-gpu-perf-10-node-single-region.yml b/system-test/performance-testcases/gce-gpu-perf-10-node-single-region.yml
index f1416a71c3..8206c889c7 100755
--- a/system-test/performance-testcases/gce-gpu-perf-10-node-single-region.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-10-node-single-region.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 10
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
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 a158c43aab..c15ac2d259 100755
--- a/system-test/performance-testcases/gce-gpu-perf-10-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-10-node.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 10
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/performance-testcases/gce-gpu-perf-25-node-single-region.yml b/system-test/performance-testcases/gce-gpu-perf-25-node-single-region.yml
index 234271db92..2a7657d730 100755
--- a/system-test/performance-testcases/gce-gpu-perf-25-node-single-region.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-25-node-single-region.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 25
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
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 8e23c5df3b..eed6b07fad 100755
--- a/system-test/performance-testcases/gce-gpu-perf-25-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-25-node.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 25
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/performance-testcases/gce-gpu-perf-5-node-single-region.yml b/system-test/performance-testcases/gce-gpu-perf-5-node-single-region.yml
index 6909f5ce5e..4ba94e1aae 100755
--- a/system-test/performance-testcases/gce-gpu-perf-5-node-single-region.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-5-node-single-region.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
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 e65ec69b42..54d1ef4c2c 100755
--- a/system-test/performance-testcases/gce-gpu-perf-5-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-5-node.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/performance-testcases/gce-gpu-perf-50-node-single-region.yml b/system-test/performance-testcases/gce-gpu-perf-50-node-single-region.yml
index f36097a25e..3b32a35420 100755
--- a/system-test/performance-testcases/gce-gpu-perf-50-node-single-region.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-50-node-single-region.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 50
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
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 bec916762a..b15dc697b0 100755
--- a/system-test/performance-testcases/gce-gpu-perf-50-node.yml
+++ b/system-test/performance-testcases/gce-gpu-perf-50-node.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 600
       NUMBER_OF_VALIDATOR_NODES: 50
       ENABLE_GPU: "true"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
diff --git a/system-test/restart-testcases/restart_gce.yml b/system-test/restart-testcases/restart_gce.yml
index d454a3b2c4..b187fa5f4d 100755
--- a/system-test/restart-testcases/restart_gce.yml
+++ b/system-test/restart-testcases/restart_gce.yml
@@ -6,7 +6,7 @@ steps:
       CLOUD_PROVIDER: "gce"
       ENABLE_GPU: "false"
       NUMBER_OF_VALIDATOR_NODES: 4
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       ADDITIONAL_FLAGS: "--dedicated"
       SKIP_PERF_RESULTS: "true"
diff --git a/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml b/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml
index 1408399941..1441a43700 100755
--- a/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml
+++ b/system-test/stability-testcases/gce-perf-stability-5-node-single-region.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 3600
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 1
       CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
       TESTNET_ZONES: "us-west1-a"
diff --git a/system-test/stability-testcases/gce-stability-5-node.yml b/system-test/stability-testcases/gce-stability-5-node.yml
index 3302caeec6..2d841715ae 100755
--- a/system-test/stability-testcases/gce-stability-5-node.yml
+++ b/system-test/stability-testcases/gce-stability-5-node.yml
@@ -9,7 +9,7 @@ steps:
       TEST_DURATION_SECONDS: 28800
       NUMBER_OF_VALIDATOR_NODES: 5
       ENABLE_GPU: "false"
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 0
       TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
       USE_PUBLIC_IP_ADDRESSES: "false"
diff --git a/system-test/stake-operations-testcases/offline_stake_gce.yml b/system-test/stake-operations-testcases/offline_stake_gce.yml
index 3efbef776f..fb2fcc695e 100755
--- a/system-test/stake-operations-testcases/offline_stake_gce.yml
+++ b/system-test/stake-operations-testcases/offline_stake_gce.yml
@@ -8,7 +8,7 @@ steps:
       ENABLE_GPU: "false"
       TEST_DURATION_SECONDS: 30
       NUMBER_OF_VALIDATOR_NODES: 1
-      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
+      VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n2-standard-16"
       NUMBER_OF_CLIENT_NODES: 0
       ADDITIONAL_FLAGS: "--dedicated"
       BOOTSTRAP_VALIDATOR_MAX_STAKE_THRESHOLD: 100