diff --git a/composite-action/terraform/action.yml b/composite-action/terraform/action.yml
index 90700a9cc..c4ef81a3e 100644
--- a/composite-action/terraform/action.yml
+++ b/composite-action/terraform/action.yml
@@ -40,7 +40,7 @@ runs:
     - name: Setup Terraform
       uses: hashicorp/setup-terraform@v2
       with:
-        terraform_version: v1.5.7
+        terraform_version: v1.6.1
 
     - name: Terraform Init
       run: terraform init
diff --git a/terraform/daily_snapshot/main.tf b/terraform/daily_snapshot/main.tf
index 9ff0cf8b2..e70cf3e33 100644
--- a/terraform/daily_snapshot/main.tf
+++ b/terraform/daily_snapshot/main.tf
@@ -14,12 +14,14 @@ terraform {
     region = "us-west-1"
     # The S3 region is determined by the endpoint. fra1 = Frankfurt.
     # This region does not have to be shared by the droplet.
-    endpoint = "https://fra1.digitaloceanspaces.com"
-
+    endpoints = {
+      s3 = "https://fra1.digitaloceanspaces.com"
+    }
     # Credentially can be validated through the Security Token Service (STS).
     # Unfortunately, DigitalOcean does not support STS so we have to skip the
     # validation.
     skip_credentials_validation = "true"
+    skip_requesting_account_id  = "true"
   }
 }
 
diff --git a/terraform/forest-calibnet/main.tf b/terraform/forest-calibnet/main.tf
index 7526d774c..5d96f1ce6 100644
--- a/terraform/forest-calibnet/main.tf
+++ b/terraform/forest-calibnet/main.tf
@@ -2,12 +2,15 @@ terraform {
   required_version = ">= 1.2"
 
   backend "s3" {
-    bucket                      = "forest-iac"
-    key                         = "forest-calibnet/terraform.tfstate"
-    region                      = "us-west-1"
-    endpoint                    = "fra1.digitaloceanspaces.com"
+    bucket = "forest-iac"
+    key    = "forest-calibnet/terraform.tfstate"
+    region = "us-west-1"
+    endpoints = {
+      s3 = "https://fra1.digitaloceanspaces.com"
+    }
     skip_credentials_validation = true
     skip_metadata_api_check     = true
+    skip_requesting_account_id  = true
   }
 }
 
diff --git a/terraform/forest-mainnet/main.tf b/terraform/forest-mainnet/main.tf
index 655475548..ae48316ce 100644
--- a/terraform/forest-mainnet/main.tf
+++ b/terraform/forest-mainnet/main.tf
@@ -2,12 +2,15 @@ terraform {
   required_version = "~> 1.3"
 
   backend "s3" {
-    bucket                      = "forest-iac"
-    key                         = "forest_mainnet/terraform.tfstate"
-    region                      = "us-west-1"
-    endpoint                    = "fra1.digitaloceanspaces.com"
+    bucket = "forest-iac"
+    key    = "forest_mainnet/terraform.tfstate"
+    region = "us-west-1"
+    endpoints = {
+      s3 = "https://fra1.digitaloceanspaces.com"
+    }
     skip_credentials_validation = true
     skip_metadata_api_check     = true
+    skip_requesting_account_id  = true
   }
 }
 
diff --git a/terraform/new-relic/main.tf b/terraform/new-relic/main.tf
index 31af739af..448819350 100644
--- a/terraform/new-relic/main.tf
+++ b/terraform/new-relic/main.tf
@@ -10,12 +10,15 @@ terraform {
     }
   }
   backend "s3" {
-    bucket                      = "forest-iac"
-    key                         = "new_relic/terraform.tfstate"
-    region                      = "us-west-1"
-    endpoint                    = "fra1.digitaloceanspaces.com"
+    bucket = "forest-iac"
+    key    = "new_relic/terraform.tfstate"
+    region = "us-west-1"
+    endpoints = {
+      s3 = "https://fra1.digitaloceanspaces.com"
+    }
     skip_credentials_validation = true
     skip_metadata_api_check     = true
+    skip_requesting_account_id  = true
   }
 }
 
diff --git a/terraform/sync_check/main.tf b/terraform/sync_check/main.tf
index e47fa1688..1c93c2cb3 100644
--- a/terraform/sync_check/main.tf
+++ b/terraform/sync_check/main.tf
@@ -14,12 +14,15 @@ terraform {
     region = "us-west-1"
     # The S3 region is determined by the endpoint. fra1 = Frankfurt.
     # This region does not have to be shared by the droplet.
-    endpoint = "https://fra1.digitaloceanspaces.com"
+    endpoints = {
+      s3 = "fra1.digitaloceanspaces.com"
+    }
 
     # Credentially can be validated through the Security Token Service (STS).
     # Unfortunately, DigitalOcean does not support STS so we have to skip the
     # validation.
     skip_credentials_validation = "true"
+    skip_requesting_account_id  = "true"
   }
 }