diff --git a/.github/workflows/ami-release-nix-single.yml b/.github/workflows/ami-release-nix-single.yml
index bb6641ff0..3d797d127 100644
--- a/.github/workflows/ami-release-nix-single.yml
+++ b/.github/workflows/ami-release-nix-single.yml
@@ -64,6 +64,12 @@ jobs:
       - name: Build AMI stage 1
         env:
           POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
+          AWS_STS_REGIONAL_ENDPOINTS: regional
+          AWS_MAX_ATTEMPTS: 50
+          AWS_RETRY_MODE: standard
+          AWS_POLL_DELAY_SECONDS: 15
+          AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10
+          AWS_METADATA_SERVICE_TIMEOUT: 5
         run: |
           GIT_SHA=${{ steps.get_sha.outputs.sha }}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
@@ -72,6 +78,12 @@ jobs:
       - name: Build AMI stage 2
         env:
           POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
+          AWS_STS_REGIONAL_ENDPOINTS: regional
+          AWS_MAX_ATTEMPTS: 50
+          AWS_RETRY_MODE: standard
+          AWS_POLL_DELAY_SECONDS: 15
+          AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10
+          AWS_METADATA_SERVICE_TIMEOUT: 5
         run: |
           GIT_SHA=${{ steps.get_sha.outputs.sha }}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl
diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml
index af003c0e2..195a334bf 100644
--- a/.github/workflows/ami-release-nix.yml
+++ b/.github/workflows/ami-release-nix.yml
@@ -92,6 +92,12 @@ jobs:
       - name: Build AMI stage 1
         env:
           POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
+          AWS_STS_REGIONAL_ENDPOINTS: regional
+          AWS_MAX_ATTEMPTS: 50
+          AWS_RETRY_MODE: standard
+          AWS_POLL_DELAY_SECONDS: 15
+          AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10
+          AWS_METADATA_SERVICE_TIMEOUT: 5
         run: |
           GIT_SHA=${{github.sha}}
           nix  run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
@@ -101,6 +107,12 @@ jobs:
       - name: Build AMI stage 2
         env:
           POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
+          AWS_STS_REGIONAL_ENDPOINTS: regional
+          AWS_MAX_ATTEMPTS: 50
+          AWS_RETRY_MODE: standard
+          AWS_POLL_DELAY_SECONDS: 15
+          AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10
+          AWS_METADATA_SERVICE_TIMEOUT: 5
         run: |
           GIT_SHA=${{github.sha}}
           nix  run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl
diff --git a/.github/workflows/testinfra-ami-build.yml b/.github/workflows/testinfra-ami-build.yml
index c337e6e47..19869df6e 100644
--- a/.github/workflows/testinfra-ami-build.yml
+++ b/.github/workflows/testinfra-ami-build.yml
@@ -109,12 +109,26 @@ jobs:
           echo "" >> common-nix.vars.pkr.hcl
 
       - name: Build AMI stage 1
+        env:
+          AWS_STS_REGIONAL_ENDPOINTS: regional
+          AWS_MAX_ATTEMPTS: 50
+          AWS_RETRY_MODE: standard
+          AWS_POLL_DELAY_SECONDS: 15
+          AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10
+          AWS_METADATA_SERVICE_TIMEOUT: 5
         run: |
           GIT_SHA=${{github.sha}}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
           nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
 
       - name: Build AMI stage 2
+        env:
+          AWS_STS_REGIONAL_ENDPOINTS: regional
+          AWS_MAX_ATTEMPTS: 50
+          AWS_RETRY_MODE: standard
+          AWS_POLL_DELAY_SECONDS: 15
+          AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10
+          AWS_METADATA_SERVICE_TIMEOUT: 5
         run: |
           GIT_SHA=${{github.sha}}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl