Revert "Replace E2 VMs with N4 across example blueprints" (#5424)

aslam-quad · web-flow · commit 8abc1fc5ff49 · 2026-03-30T04:49:00.000Z
diff --git a/community/examples/client-google-cloud-storage.yaml b/community/examples/client-google-cloud-storage.yaml
@@ -56,7 +56,7 @@ deployment_groups:
     - existing-bucket
     settings:
       name_prefix: workstation
-      machine_type: n4-standard-2
+      machine_type: e2-standard-2
       allow_automatic_updates: false
 
   - id: wait
diff --git a/community/examples/flux-framework/flux-cluster.yaml b/community/examples/flux-framework/flux-cluster.yaml
@@ -49,12 +49,12 @@ deployment_groups:
       login_node_specs:
       - name_prefix: gfluxfw-login
         machine_arch: x86-64
-        machine_type: n4-standard-4
+        machine_type: e2-standard-4
         instances: 1
         properties: []
         boot_script: null
       manager_name_prefix: gfluxfw
-      manager_machine_type: n4-standard-8
+      manager_machine_type: e2-standard-8
 
       subnetwork: $(flux-net.subnetwork_self_link)
 
diff --git a/community/examples/hpc-slinky/hpc-slinky.yaml b/community/examples/hpc-slinky/hpc-slinky.yaml
@@ -24,7 +24,7 @@ vars:
   authorized_cidr:  # <your-ip-address>/32
   gcp_public_cidrs_access_enabled: false
   exporter_pod_monitoring_path: $(ghpc_stage("./exporter-pod-monitoring.yaml"))
-  base_pool_machine_type: n4-standard-8
+  base_pool_machine_type: e2-standard-8
   base_pool_size: 2
   debug_nodeset_replicas: 2
   compute_pool_machine_type: h3-standard-88
diff --git a/community/examples/slurm-gke/slurm-gke.yaml b/community/examples/slurm-gke/slurm-gke.yaml
@@ -108,7 +108,7 @@ deployment_groups:
     settings:
       initial_node_count: 1
       disk_type: pd-balanced
-      machine_type: n4-standard-4
+      machine_type: e2-standard-4
       zones: [$(vars.zone)]
 
   - id: gke_compute_pool
diff --git a/community/examples/xpk-n2-filestore/xpk-n2-filestore.yaml b/community/examples/xpk-n2-filestore/xpk-n2-filestore.yaml
@@ -54,7 +54,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [network]
     settings:
-      system_node_pool_machine_type: "n4-standard-4"
+      system_node_pool_machine_type: "e2-standard-4"
       system_node_pool_node_count:
         total_min_nodes: 1
         total_max_nodes: 1000
diff --git a/community/front-end/ofe/tf/README.md b/community/front-end/ofe/tf/README.md
@@ -66,7 +66,7 @@ limitations under the License.
 | <a name="input_region"></a> [region](#input\_region) | GCP Region for HPC Frontend deployment. | `string` | n/a | yes |
 | <a name="input_repo_branch"></a> [repo\_branch](#input\_repo\_branch) | git branch to checkout when deploying the HPC Frontend | `string` | `"main"` | no |
 | <a name="input_repo_fork"></a> [repo\_fork](#input\_repo\_fork) | GitHub repository name in which to find the cluster-toolkit repo | `string` | `"GoogleCloudPlatform"` | no |
-| <a name="input_server_instance_type"></a> [server\_instance\_type](#input\_server\_instance\_type) | Instance size to use from HPC Frontend webserver | `string` | `"n4-standard-2"` | no |
+| <a name="input_server_instance_type"></a> [server\_instance\_type](#input\_server\_instance\_type) | Instance size to use from HPC Frontend webserver | `string` | `"e2-standard-2"` | no |
 | <a name="input_static_ip"></a> [static\_ip](#input\_static\_ip) | Optional pre-configured static IP for HPC Frontend. | `string` | `""` | no |
 | <a name="input_subnet"></a> [subnet](#input\_subnet) | Subnet in which to deploy HPC Frontend. | `string` | `""` | no |
 | <a name="input_webserver_hostname"></a> [webserver\_hostname](#input\_webserver\_hostname) | DNS Hostname for the webserver | `string` | `""` | no |
diff --git a/community/front-end/ofe/tf/variables.tf b/community/front-end/ofe/tf/variables.tf
@@ -70,7 +70,7 @@ variable "django_su_email" {
 }
 
 variable "server_instance_type" {
-  default     = "n4-standard-2"
+  default     = "e2-standard-2"
   type        = string
   description = "Instance size to use from HPC Frontend webserver"
 }
diff --git a/community/modules/scheduler/slinky/README.md b/community/modules/scheduler/slinky/README.md
@@ -64,7 +64,7 @@ Through `cert_manager_values`, `prometheus_values`, `slurm_operator_values`, and
                 - key: "node.kubernetes.io/instance-type"
                   operator: In
                   values:
-                  - n4-standard-8 # base_pool's machine-type
+                  - e2-standard-8 # base_pool's machine-type
 ```
 
 This creates a Slinky cluster with the following attributes:
diff --git a/examples/gke-a3-highgpu-inference-gateway.yaml b/examples/gke-a3-highgpu-inference-gateway.yaml
@@ -122,7 +122,7 @@ deployment_groups:
     use: [gke_cluster, node_pool_service_account]
     settings:
       name: "default"
-      machine_type: "n4-standard-2"
+      machine_type: "e2-standard-2"
       autoscaling_total_min_nodes: 1
       autoscaling_total_max_nodes: 3
       zones: [$(vars.zone)]
diff --git a/examples/gke-a3-ultragpu/gke-a3-ultragpu.yaml b/examples/gke-a3-ultragpu/gke-a3-ultragpu.yaml
@@ -167,7 +167,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [gke-a3-ultra-net-0, workload_service_account]
     settings:
-      system_node_pool_machine_type: "n4-standard-16"
+      system_node_pool_machine_type: "e2-standard-16"
       system_node_pool_disk_size_gb: $(vars.system_node_pool_disk_size_gb)
       system_node_pool_taints: []
       enable_dcgm_monitoring: true
diff --git a/examples/gke-a4/gke-a4.yaml b/examples/gke-a4/gke-a4.yaml
@@ -182,7 +182,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [gke-a4-net-0, workload_service_account]
     settings:
-      system_node_pool_machine_type: "n4-standard-16"
+      system_node_pool_machine_type: "e2-standard-16"
       system_node_pool_disk_size_gb: $(vars.system_node_pool_disk_size_gb)
       system_node_pool_taints: []
       enable_dcgm_monitoring: true
diff --git a/examples/gke-a4x-max-bm/gke-a4x-max-bm.yaml b/examples/gke-a4x-max-bm/gke-a4x-max-bm.yaml
@@ -48,7 +48,7 @@ vars:
   # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
   reservation:
   compute_nodepool_machine_type: a4x-maxgpu-4g-metal
-  system_nodepool_machine_type: n4-standard-16
+  system_nodepool_machine_type: e2-standard-16
 
   nvidia_dra_driver_path: $(ghpc_stage("./nvidia-dra-driver.yaml"))
   asapd_lite_installer_path: $(ghpc_stage("./asapd-lite-installer.yaml"))
diff --git a/examples/gke-a4x/gke-a4x.yaml b/examples/gke-a4x/gke-a4x.yaml
@@ -48,7 +48,7 @@ vars:
   # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
   reservation:
   compute_nodepool_machine_type: a4x-highgpu-4g
-  system_nodepool_machine_type: n4-standard-16
+  system_nodepool_machine_type: e2-standard-16
 
   # Installs NCCL library and Google NCCL plugin
   # Runs an init container on all GB200 GPU nodes with the NCCL plugin image
diff --git a/examples/gke-consumption-options/dws-flex-start-queued-provisioning/gke-a3-ultragpu.yaml b/examples/gke-consumption-options/dws-flex-start-queued-provisioning/gke-a3-ultragpu.yaml
@@ -124,7 +124,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [gke-a3-ultra-net-0, workload_service_account]
     settings:
-      system_node_pool_machine_type: "n4-standard-16"
+      system_node_pool_machine_type: "e2-standard-16"
       system_node_pool_disk_size_gb: $(vars.system_node_pool_disk_size_gb)
       system_node_pool_taints: []
       enable_dcgm_monitoring: true
diff --git a/examples/gke-consumption-options/dws-flex-start/gke-a3-ultragpu.yaml b/examples/gke-consumption-options/dws-flex-start/gke-a3-ultragpu.yaml
@@ -116,7 +116,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [gke-a3-ultra-net-0, workload_service_account]
     settings:
-      system_node_pool_machine_type: "n4-standard-16"
+      system_node_pool_machine_type: "e2-standard-16"
       system_node_pool_disk_size_gb: $(vars.system_node_pool_disk_size_gb)
       system_node_pool_taints: []
       enable_dcgm_monitoring: true
diff --git a/examples/gke-g4/gke-g4.yaml b/examples/gke-g4/gke-g4.yaml
@@ -117,7 +117,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [gke-g4-net-0, workload_service_account]
     settings:
-      system_node_pool_machine_type: "n4-standard-16"
+      system_node_pool_machine_type: "e2-standard-16"
       system_node_pool_disk_size_gb: $(vars.system_node_pool_disk_size_gb)
       system_node_pool_taints: []
       enable_dcgm_monitoring: true
diff --git a/examples/gke-h4d/gke-h4d.yaml b/examples/gke-h4d/gke-h4d.yaml
@@ -117,7 +117,7 @@ deployment_groups:
     source: modules/scheduler/gke-cluster
     use: [gke-h4d-net, gke-h4d-rdma-net, workload_service_account]
     settings:
-      system_node_pool_machine_type: "n4-standard-16"
+      system_node_pool_machine_type: "e2-standard-16"
       system_node_pool_disk_size_gb: $(vars.system_node_pool_disk_size_gb)
       system_node_pool_taints: []
       enable_multi_networking: true
diff --git a/modules/compute/resource-policy/README.md b/modules/compute/resource-policy/README.md
@@ -19,7 +19,7 @@ The following example creates a group placement resource policy and applies it t
     source: modules/compute/gke-node-pool
     use: [group_placement_1]
     settings:
-      machine_type: n4-standard-8
+      machine_type: e2-standard-8
     outputs: [instructions]
 ```
 
diff --git a/tools/cloud-build/daily-tests/builds/gke-a2-highgpu-kueue-onspot.yaml b/tools/cloud-build/daily-tests/builds/gke-a2-highgpu-kueue-onspot.yaml
@@ -92,7 +92,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [network1]'                           >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
 
diff --git a/tools/cloud-build/daily-tests/builds/gke-a3-highgpu-onspot.yaml b/tools/cloud-build/daily-tests/builds/gke-a3-highgpu-onspot.yaml
@@ -74,7 +74,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [network1]'                           >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a3-highgpu.yaml b/tools/cloud-build/daily-tests/builds/gke-a3-highgpu.yaml
@@ -60,7 +60,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [network1]'                           >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a3-megagpu-onspot.yaml b/tools/cloud-build/daily-tests/builds/gke-a3-megagpu-onspot.yaml
@@ -74,7 +74,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [network1]'                           >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a3-megagpu.yaml b/tools/cloud-build/daily-tests/builds/gke-a3-megagpu.yaml
@@ -60,7 +60,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [network1]'                           >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a3-ultragpu-onspot.yaml b/tools/cloud-build/daily-tests/builds/gke-a3-ultragpu-onspot.yaml
@@ -78,7 +78,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [gke-a3-ultra-net-0]'                 >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a3-ultragpu.yaml b/tools/cloud-build/daily-tests/builds/gke-a3-ultragpu.yaml
@@ -64,7 +64,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [gke-a3-ultra-net-0]'                 >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a4-onspot.yaml b/tools/cloud-build/daily-tests/builds/gke-a4-onspot.yaml
@@ -78,7 +78,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [gke-a4-net-0]'                       >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-a4x.yaml b/tools/cloud-build/daily-tests/builds/gke-a4x.yaml
@@ -66,7 +66,7 @@ steps:
     echo '    source: modules/compute/vm-instance'             >> $${EXAMPLE_BP}
     echo '    use: [gke-a4x-net-0]'                            >> $${EXAMPLE_BP}
     echo '    settings:'                                       >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'                   >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'                   >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                      >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true'       >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-g4.yaml b/tools/cloud-build/daily-tests/builds/gke-g4.yaml
@@ -59,7 +59,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [gke-g4-net-0]'                       >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-h4d-onspot.yaml b/tools/cloud-build/daily-tests/builds/gke-h4d-onspot.yaml
@@ -77,7 +77,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [gke-h4d-net]'                        >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
 
diff --git a/tools/cloud-build/daily-tests/builds/gke-h4d.yaml b/tools/cloud-build/daily-tests/builds/gke-h4d.yaml
@@ -63,7 +63,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [gke-h4d-net]'                        >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
     echo ''
diff --git a/tools/cloud-build/daily-tests/builds/gke-inactive-reservation.yaml b/tools/cloud-build/daily-tests/builds/gke-inactive-reservation.yaml
@@ -60,15 +60,15 @@ steps:
     echo '    source: modules/compute/vm-instance'                >> $${EXAMPLE_BP}
     echo '    use: [network1]'                                    >> $${EXAMPLE_BP}
     echo '    settings:'                                          >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'                      >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'                      >> $${EXAMPLE_BP}
     echo '      zone: us-central1-a'                              >> $${EXAMPLE_BP}
 
     # Adding node pool with reservation defined
     echo '  - id: compute-pool-reservation'                       >> $${EXAMPLE_BP}
     echo '    source: modules/compute/gke-node-pool'              >> $${EXAMPLE_BP}
     echo '    use: [gke_cluster, node_pool_service_account]'      >> $${EXAMPLE_BP}
     echo '    settings:'                                          >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'                      >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'                      >> $${EXAMPLE_BP}
     echo '      zones: [us-central1-a]'                           >> $${EXAMPLE_BP}
     echo '      static_node_count: 0'                             >> $${EXAMPLE_BP}
     echo '      is_reservation_active: false'                     >> $${EXAMPLE_BP}
diff --git a/tools/cloud-build/daily-tests/builds/gke-managed-hyperdisk.yaml b/tools/cloud-build/daily-tests/builds/gke-managed-hyperdisk.yaml
@@ -61,7 +61,7 @@ steps:
     echo '    source: modules/compute/vm-instance' >> $${SG_EXAMPLE}
     echo '    use: [network]'                      >> $${SG_EXAMPLE}
     echo '    settings:'                           >> $${SG_EXAMPLE}
-    echo '      machine_type: n4-standard-2'       >> $${SG_EXAMPLE}
+    echo '      machine_type: e2-standard-2'       >> $${SG_EXAMPLE}
     echo '      zone: europe-west1-b'              >> $${SG_EXAMPLE}
 
     IP=$(curl ifconfig.me)
diff --git a/tools/cloud-build/daily-tests/builds/gke-managed-lustre.yaml b/tools/cloud-build/daily-tests/builds/gke-managed-lustre.yaml
@@ -63,7 +63,7 @@ steps:
     echo '    source: modules/compute/vm-instance' >> $${EXAMPLE_BP}
     echo '    use: [network]'                      >> $${EXAMPLE_BP}
     echo '    settings:'                           >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'       >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'       >> $${EXAMPLE_BP}
     echo '      zone: us-central1-c'               >> $${EXAMPLE_BP}
 
     IP=$(curl ifconfig.me)
diff --git a/tools/cloud-build/daily-tests/builds/gke-storage.yaml b/tools/cloud-build/daily-tests/builds/gke-storage.yaml
@@ -65,7 +65,7 @@ steps:
     echo '    source: modules/compute/vm-instance' >> $${SG_EXAMPLE}
     echo '    use: [network1]'                     >> $${SG_EXAMPLE}
     echo '    settings:'                           >> $${SG_EXAMPLE}
-    echo '      machine_type: n4-standard-2'       >> $${SG_EXAMPLE}
+    echo '      machine_type: e2-standard-2'       >> $${SG_EXAMPLE}
     echo '      zone: us-central1-b'               >> $${SG_EXAMPLE}
     bash tools/add_ttl_label.sh "$${SG_EXAMPLE}"
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml \
diff --git a/tools/cloud-build/daily-tests/builds/gke.yaml b/tools/cloud-build/daily-tests/builds/gke.yaml
@@ -60,7 +60,7 @@ steps:
     echo '    source: modules/compute/vm-instance' >> $${SG_EXAMPLE}
     echo '    use: [network1]'                     >> $${SG_EXAMPLE}
     echo '    settings:'                           >> $${SG_EXAMPLE}
-    echo '      machine_type: n4-standard-2'       >> $${SG_EXAMPLE}
+    echo '      machine_type: e2-standard-2'       >> $${SG_EXAMPLE}
     echo '      zone: us-central1-a'               >> $${SG_EXAMPLE}
 
     echo '  - id: ubuntu_pool'                                         >> $${SG_EXAMPLE}
diff --git a/tools/cloud-build/daily-tests/builds/ml-gke-e2e.yaml b/tools/cloud-build/daily-tests/builds/ml-gke-e2e.yaml
@@ -60,7 +60,7 @@ steps:
     echo '    source: modules/compute/vm-instance' >> $${SG_EXAMPLE}
     echo '    use: [network1]'                     >> $${SG_EXAMPLE}
     echo '    settings:'                           >> $${SG_EXAMPLE}
-    echo '      machine_type: n4-standard-2'       >> $${SG_EXAMPLE}
+    echo '      machine_type: e2-standard-2'       >> $${SG_EXAMPLE}
     echo '      zone: asia-southeast1-b'           >> $${SG_EXAMPLE}
 
     echo '  - id: ubuntu_pool'                                         >> $${SG_EXAMPLE}
diff --git a/tools/cloud-build/daily-tests/builds/ml-gke.yaml b/tools/cloud-build/daily-tests/builds/ml-gke.yaml
@@ -60,7 +60,7 @@ steps:
     echo '    source: modules/compute/vm-instance' >> $${SG_EXAMPLE}
     echo '    use: [network1]'                     >> $${SG_EXAMPLE}
     echo '    settings:'                           >> $${SG_EXAMPLE}
-    echo '      machine_type: n4-standard-2'       >> $${SG_EXAMPLE}
+    echo '      machine_type: e2-standard-2'       >> $${SG_EXAMPLE}
     echo '      zone: asia-southeast1-b'           >> $${SG_EXAMPLE}
 
     echo '  - id: ubuntu_pool'                               >> $${SG_EXAMPLE}
diff --git a/tools/cloud-build/daily-tests/builds/slinky.yml b/tools/cloud-build/daily-tests/builds/slinky.yml
@@ -60,7 +60,7 @@ steps:
     echo '    source: modules/compute/vm-instance'       >> $${EXAMPLE_BP}
     echo '    use: [network]'                            >> $${EXAMPLE_BP}
     echo '    settings:'                                 >> $${EXAMPLE_BP}
-    echo '      machine_type: n4-standard-2'             >> $${EXAMPLE_BP}
+    echo '      machine_type: e2-standard-2'             >> $${EXAMPLE_BP}
     echo '      zone: us-central1-a'                     >> $${SG_EXAMPLE}
     echo '      name_prefix: remote-node'                >> $${EXAMPLE_BP}
     echo '      add_deployment_name_before_prefix: true' >> $${EXAMPLE_BP}
diff --git a/tools/cloud-workstations/README.md b/tools/cloud-workstations/README.md
@@ -17,7 +17,7 @@ WORKSTATION_NAME=hpc-toolkit-workstation
 CLUSTER_NAME=$WORKSTATION_NAME-cluster
 CONFIG_NAME=$WORKSTATION_NAME-config
 CUSTOM_IMAGE=us-docker.pkg.dev/${PROJECT_ID}/${WORKSTATION_NAME}/hpc-toolkit-workstation:latest
-MACHINE_TYPE=n4-standard-8
+MACHINE_TYPE=e2-standard-8
 SERVICE_ACCOUNT=<service account email>
 ```
 
diff --git a/tools/validate_configs/test_configs/2filestore-4instances.yaml b/tools/validate_configs/test_configs/2filestore-4instances.yaml
@@ -51,7 +51,7 @@ deployment_groups:
     use: [network, homefs]
     settings:
       name_prefix: ls1
-      machine_type: n4-standard-4
+      machine_type: e2-standard-4
       labels:
         ghpc_role: license
 
@@ -60,7 +60,7 @@ deployment_groups:
     use: [network, homefs]
     settings:
       name_prefix: ls2
-      machine_type: n4-standard-4
+      machine_type: e2-standard-4
       labels:
         ghpc_role: license
 
diff --git a/tools/validate_configs/test_configs/centos8-ss.yaml b/tools/validate_configs/test_configs/centos8-ss.yaml
diff --git a/tools/validate_configs/test_configs/complex-data.yaml b/tools/validate_configs/test_configs/complex-data.yaml
diff --git a/tools/validate_configs/test_configs/debian-ss.yaml b/tools/validate_configs/test_configs/debian-ss.yaml
diff --git a/tools/validate_configs/test_configs/hpc-centos-ss.yaml b/tools/validate_configs/test_configs/hpc-centos-ss.yaml
diff --git a/tools/validate_configs/test_configs/hpc-cluster-simple.yaml b/tools/validate_configs/test_configs/hpc-cluster-simple.yaml
diff --git a/tools/validate_configs/test_configs/instance-with-startup.yaml b/tools/validate_configs/test_configs/instance-with-startup.yaml
diff --git a/tools/validate_configs/test_configs/rocky-ss.yaml b/tools/validate_configs/test_configs/rocky-ss.yaml
diff --git a/tools/validate_configs/test_configs/simple-startup.yaml b/tools/validate_configs/test_configs/simple-startup.yaml
diff --git a/tools/validate_configs/test_configs/startup-options.yaml b/tools/validate_configs/test_configs/startup-options.yaml
diff --git a/tools/validate_configs/test_configs/ubuntu-ss.yaml b/tools/validate_configs/test_configs/ubuntu-ss.yaml

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ variable "django_su_email" {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`variable "server_instance_type" {`
`73`		`- default = "n4-standard-2"`
	`73`	`+ default = "e2-standard-2"`
`74`	`74`	`type = string`
`75`	`75`	`description = "Instance size to use from HPC Frontend webserver"`
`76`	`76`	`}`