diff --git a/amazon-amd64-nix.pkr.hcl b/amazon-amd64-nix.pkr.hcl
index 9a3476f3e..9ec3ed95c 100644
--- a/amazon-amd64-nix.pkr.hcl
+++ b/amazon-amd64-nix.pkr.hcl
@@ -124,10 +124,8 @@ source "amazon-ebssurrogate" "source" {
   launch_block_device_mappings {
     device_name           = "/dev/xvdf"
     delete_on_termination = true
-    volume_size           = 20
+    volume_size           = 10
     volume_type           = "gp3"
-    iops                  = 10000
-    throughput            = 1000
    }
 
   # NOTE: /dev/xvdh is mounted as /data (PostgreSQL data/WAL). The 1 GiB size
@@ -143,11 +141,9 @@ source "amazon-ebssurrogate" "source" {
   launch_block_device_mappings {
     device_name           = "/dev/${var.build-vol}"
     delete_on_termination = true
-    volume_size           = 20
+    volume_size           = 16
     volume_type           = "gp3"
     omit_from_artifact    = true
-    iops                  = 10000       # Added for build performance
-    throughput            = 1000        # Added for build performance
   }
 
   run_tags = {
diff --git a/amazon-arm64-nix.pkr.hcl b/amazon-arm64-nix.pkr.hcl
index a0f89974f..4faa8aac4 100644
--- a/amazon-arm64-nix.pkr.hcl
+++ b/amazon-arm64-nix.pkr.hcl
@@ -124,10 +124,8 @@ source "amazon-ebssurrogate" "source" {
   launch_block_device_mappings {
     device_name           = "/dev/xvdf"
     delete_on_termination = true
-    volume_size           = 20
+    volume_size           = 10
     volume_type           = "gp3"
-    iops                  = 10000
-    throughput            = 1000
    }
 
   # NOTE: /dev/xvdh is mounted as /data (PostgreSQL data/WAL). The 1 GiB size
@@ -143,11 +141,9 @@ source "amazon-ebssurrogate" "source" {
   launch_block_device_mappings {
     device_name           = "/dev/${var.build-vol}"
     delete_on_termination = true
-    volume_size           = 20
+    volume_size           = 16
     volume_type           = "gp3"
     omit_from_artifact    = true
-    iops                  = 10000       # Added for build performance
-    throughput            = 1000        # Added for build performance
   }
 
   run_tags = {
diff --git a/ansible/vars.yml b/ansible/vars.yml
index 252862dd5..d4b922e5a 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.072-orioledb"
-  postgres17: "17.6.1.115"
-  postgres15: "15.14.1.115"
+  postgresorioledb-17: "17.6.0.073-orioledb"
+  postgres17: "17.6.1.116"
+  postgres15: "15.14.1.116"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.25.1