diff --git a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml
index a28c8daf65cd3..5034ba3055b1d 100644
--- a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml
+++ b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml
@@ -10,6 +10,7 @@ metadata:
   name: build01-9hdwj-worker-us-east-1a
   namespace: openshift-machine-api
 spec:
+  deletePolicy: oldest
   selector:
     matchLabels:
       machine.openshift.io/cluster-api-cluster: build01-9hdwj
@@ -32,9 +33,8 @@ spec:
           apiVersion: awsproviderconfig.openshift.io/v1beta1
           blockDevices:
           - ebs:
-              iops: 16000
-              volumeSize: 640
-              volumeType: io1
+              volumeSize: 400
+              volumeType: gp2
           credentialsSecret:
             name: aws-cloud-credentials
           deviceIndex: 0
diff --git a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml
index cd973a10c23d7..384679d387af0 100644
--- a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml
+++ b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml
@@ -10,6 +10,7 @@ metadata:
   name: build01-9hdwj-worker-us-east-1b
   namespace: openshift-machine-api
 spec:
+  deletePolicy: oldest
   selector:
     matchLabels:
       machine.openshift.io/cluster-api-cluster: build01-9hdwj
@@ -32,9 +33,8 @@ spec:
           apiVersion: awsproviderconfig.openshift.io/v1beta1
           blockDevices:
           - ebs:
-              iops: 16000
-              volumeSize: 640
-              volumeType: io1
+              volumeSize: 400
+              volumeType: gp2
           credentialsSecret:
             name: aws-cloud-credentials
           deviceIndex: 0
diff --git a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml
index d002a5a97900b..5017ac6f1d2d1 100644
--- a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml
+++ b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml
@@ -10,6 +10,7 @@ metadata:
   name: build01-9hdwj-worker-us-east-1c
   namespace: openshift-machine-api
 spec:
+  deletePolicy: oldest
   selector:
     matchLabels:
       machine.openshift.io/cluster-api-cluster: build01-9hdwj
@@ -32,9 +33,8 @@ spec:
           apiVersion: awsproviderconfig.openshift.io/v1beta1
           blockDevices:
           - ebs:
-              iops: 16000
-              volumeSize: 640
-              volumeType: io1
+              volumeSize: 400
+              volumeType: gp2
           credentialsSecret:
             name: aws-cloud-credentials
           deviceIndex: 0