diff --git a/src/commcare_cloud/commands/terraform/templates/commcarehq.tf.j2 b/src/commcare_cloud/commands/terraform/templates/commcarehq.tf.j2
index 2f84cab48b..b6b2e1478c 100644
--- a/src/commcare_cloud/commands/terraform/templates/commcarehq.tf.j2
+++ b/src/commcare_cloud/commands/terraform/templates/commcarehq.tf.j2
@@ -285,10 +285,6 @@ module "r53_record__{{ record.route_name }}" {
   record_type = {{ record.record_type|tojson }}
   ttl = {{ record.ttl|tojson }}
 
-  {% if r53_private_zone %}
-  # Ensure we wait for the zone if we are creating it in this same run
-  depends_on = [module.r53-private-zone-create]
-  {% endif %}
 }
 {% endfor %}
 
@@ -453,8 +449,7 @@ module "efs_mount__{{ efs_file_system_mount.efs_name }}__{{ az }}" {
         domain_name = {{ efs_file_system_route53.domain_name|tojson }}
         route_names = {{ efs_file_system_route53.route_names|tojson }}
         records = module.efs_file_system__{{ efs_file_system_route53.efs_name }}.efs_endpoint_address
-        depends_on = [module.r53-private-zone-create]
-    }
+      }
 {% endfor %}
 
 {% endif %}
diff --git a/src/commcare_cloud/commands/terraform/templates/terraform.lock.hcl.j2 b/src/commcare_cloud/commands/terraform/templates/terraform.lock.hcl.j2
index d0422c2504..f1d5375d25 100644
--- a/src/commcare_cloud/commands/terraform/templates/terraform.lock.hcl.j2
+++ b/src/commcare_cloud/commands/terraform/templates/terraform.lock.hcl.j2
@@ -26,29 +26,25 @@ provider "registry.terraform.io/hashicorp/archive" {
 }
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "5.40.0"
-  constraints = ">= 4.45.0, ~> 5.40.0"
+  version     = "6.16.0"
+  constraints = ">= 4.45.0, ~> 6.16.0"
   hashes = [
-    "h1:66UBDb7nDnLJ3MHmRZZRlqvWoeJOFFwN44gifJzs/IE=",
-    "h1:KEqMoJwLw6Z9bTO4K8nPVvQQa6YiM+bvz89Sw7tNFJw=",
-    "h1:mLZbhNUyXQTWQXOCoHglI10XwcvqGqvnn21juy/Jk68=",
-    "h1:vnFdR2OxkoCLwmyi1DmuAoM+fdqW3g66Hx7mYsR6b1E=",
-    "h1:zLyZ/YmqluE1hU1kMw2gH8qNI6RP8nfZpCGYCa66q4g=",
-    "zh:11f177a2385703740bd26d0652d3dba08575101d7639f386ce5637bdb0e29a13",
-    "zh:203fc43e69634f1bd487a9dc24b01944dfd568beac78e491f26677d103d343ed",
-    "zh:3697ebad4929da30ea98276a85d4ce5ebfc48508f4dd149e17e1dcdc7f306c6e",
-    "zh:421e0799756587e728f75a9024b8d4e38707cd6d65cf0710cb8d189062c85a58",
-    "zh:4be2adcd4c32a66159c532908f0d425d793c814b3686832e9af549b1515ae032",
-    "zh:55778b32470212ce6bbfd402529c88e7ea6ba34b0882f85d6ea001ff5c6255a5",
-    "zh:689a4c1fd1e1d5dab7b169759389c76f25e366f19a470971674321d6fca09791",
-    "zh:68a23eda608573a053e8738894457bd0c11766bc243e68826c78ab6b5a144710",
+    "h1:NvE2p1246fuy8CkSn9urzNg1XuXmlQkjeUJsL9Gjd6A=",
+    "zh:11b5c11fc47aa7537d3acfb3156c9206ce465c2c0db4478914d1ba9493a27f38",
+    "zh:1de5c4ef8096ab6a4fe8e528c5a1d772a57de74ef4de98996071987d0d6a7696",
+    "zh:1eaaaa02503e34e57494831ea32b3327482857b01011b40753ec37c502719ee0",
+    "zh:367159ac72b344802e72631505894b1e7c04211f59d17c137cc9528acfb3b940",
+    "zh:449bb91e861d16ce80aabe148b40fa20ee4250c934cf467f6c21cf2206be1b5f",
+    "zh:45b4757e15a9887bf1d6dce07cbbbff365399759bb920456cf30cae47f0b0170",
+    "zh:4d2824050f8f2d3916a3363e0eeeab6c2c5a0912323029c4c7dc6e93ff3cfbc1",
+    "zh:6f363f811d20d7bd3e558d6da2cff0506c78ccea5956f919e531b22fdc7300c8",
+    "zh:7ab0990fc172a1343e4af6d7540be43adba989ee1b422b9d54c3369247155cea",
     "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:a1580115c22564e5752e569dc40482503de6cced44da3e9431885cd9d4bf18ea",
-    "zh:b127756d7ee513691e76c211570580c10eaa2f7a7e4fd27c3566a48ec214991c",
-    "zh:b7ccea7a759940c8dcf8726272eed6653eed0b31f7223f71e829a344627afd39",
-    "zh:bb130fc50494fd45406e04b44d242da9a8f138a4a43feb65cf9e86d13aa13629",
-    "zh:cf1c972c90d5f22c9705274a33792275e284a0a3fcac12ce4083b5a4480463f4",
-    "zh:ebe60d3887b23703ca6a4c65b15c6d7b8d93ba27a028d996d17882fe6e98d5c0",
+    "zh:9eaae66cc57aa07a392eb9cb3fc115a5f446ffe9f51a7f45ffaefc7a64c17b31",
+    "zh:aee7dbba84823ed9ca93afb0579c78605588f9355e23ec1aafa22ac4a77c45c3",
+    "zh:be18792d2a52bbc06e6d21dc69c7ec7134e7aaf9e8bca5fd48d2edc8c1f9085e",
+    "zh:d2fb28162a6ed080fefe1d16b20be86652568e930aa777f186ecfcac66af6c43",
+    "zh:e1ffb80f46b64c26742417abe454af9c0d3920a8636698574c0a558e66cad535",
   ]
 }
 
diff --git a/src/commcare_cloud/commands/terraform/templates/terraform.tf.j2 b/src/commcare_cloud/commands/terraform/templates/terraform.tf.j2
index 809acdb01a..531f71c589 100644
--- a/src/commcare_cloud/commands/terraform/templates/terraform.tf.j2
+++ b/src/commcare_cloud/commands/terraform/templates/terraform.tf.j2
@@ -11,7 +11,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.40.0"
+      version = "~> 6.16.0"
     }
     archive = {
       source = "hashicorp/archive"