diff --git a/manifests/bosh-manifest/operations.d/023-cpi-uses-gp3-disks.yml b/manifests/bosh-manifest/operations.d/023-cpi-uses-gp3-disks.yml
new file mode 100644
index 000000000..b3cc5e075
--- /dev/null
+++ b/manifests/bosh-manifest/operations.d/023-cpi-uses-gp3-disks.yml
@@ -0,0 +1,9 @@
+---
+- type: replace
+  path: /resource_pools/name=vms/cloud_properties/ephemeral_disk/type
+  value: gp3
+
+- type: replace
+  path: /disk_pools/name=disks/cloud_properties/type
+  value: gp3
+
diff --git a/manifests/cloud-config/paas-bootstrap-cloud-config.yml b/manifests/cloud-config/paas-bootstrap-cloud-config.yml
index ada25c926..3f4525506 100644
--- a/manifests/cloud-config/paas-bootstrap-cloud-config.yml
+++ b/manifests/cloud-config/paas-bootstrap-cloud-config.yml
@@ -24,7 +24,7 @@ vm_types:
       auto_assign_public_ip: true
       ephemeral_disk:
         size: 20480
-        type: gp2
+        type: gp3
 
   - name: concourse
     cloud_properties:
@@ -32,7 +32,7 @@ vm_types:
       instance_type: (( grab $CONCOURSE_INSTANCE_TYPE ))
       ephemeral_disk:
         size: 102400
-        type: gp2
+        type: gp3
 
   - name: concourse_worker
     cloud_properties:
@@ -41,7 +41,7 @@ vm_types:
       instance_type: (( grab $CONCOURSE_INSTANCE_TYPE ))
       ephemeral_disk:
         size: 102400
-        type: gp2
+        type: gp3
 
 
 vm_extensions: