diff --git a/terraform/README.md b/terraform/README.md
index a812b2208..40ab78a19 100644
--- a/terraform/README.md
+++ b/terraform/README.md
@@ -88,6 +88,8 @@ The below steps rely on you first configuring access to the Terraform state in s
     terraform plan
     ```
 
+    If the `terraform init` command fails, you may need to run `terraform init -upgrade` to make sure new module versions are picked up.
+
 1. Apply changes with `terraform apply`.
 
 1. Remove the space deployer service instance if it doesn't need to be used again, such as when manually running terraform once.
diff --git a/terraform/bootstrap/main.tf b/terraform/bootstrap/main.tf
index 5f30791c6..625cb8093 100644
--- a/terraform/bootstrap/main.tf
+++ b/terraform/bootstrap/main.tf
@@ -3,7 +3,7 @@ locals {
 }
 
 module "s3" {
-  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.3.0"
+  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
 
   cf_org_name   = "gsa-tts-benefits-studio"
   cf_space_name = "notify-management"
diff --git a/terraform/bootstrap/providers.tf b/terraform/bootstrap/providers.tf
index a2d023da3..5dcaece3e 100644
--- a/terraform/bootstrap/providers.tf
+++ b/terraform/bootstrap/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.15.5"
+      version = "0.53.0"
     }
   }
 }
diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index b1224bb4e..615f92670 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -7,7 +7,7 @@ locals {
 }
 
 module "database" {
-  source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
 }
 
 module "redis" {
-  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
 }
 
 module "csv_upload_bucket" {
-  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf
index 180959761..f13333d3e 100644
--- a/terraform/demo/providers.tf
+++ b/terraform/demo/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.15.5"
+      version = "0.53.0"
     }
   }
 
@@ -12,7 +12,6 @@ terraform {
     key     = "api.tfstate.demo"
     encrypt = "true"
     region  = "us-gov-west-1"
-    profile = "notify-terraform-backend"
   }
 }
 
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 4dd7d741c..1f45b2b6a 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -6,7 +6,7 @@ locals {
 }
 
 module "csv_upload_bucket" {
-  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
diff --git a/terraform/development/providers.tf b/terraform/development/providers.tf
index d8ae4488e..5dcaece3e 100644
--- a/terraform/development/providers.tf
+++ b/terraform/development/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.50.7"
+      version = "0.53.0"
     }
   }
 }
diff --git a/terraform/development/reset.sh b/terraform/development/reset.sh
index fba5f104b..ec5cf25a5 100755
--- a/terraform/development/reset.sh
+++ b/terraform/development/reset.sh
@@ -51,7 +51,7 @@ if [[ ! -s "secrets.auto.tfvars" ]]; then
 fi
 
 echo "Importing terraform state for $username"
-terraform init
+terraform init -upgrade
 
 key_name=$username-api-dev-key
 
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 7476338d2..5a2c520b1 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -7,7 +7,7 @@ locals {
 }
 
 module "database" {
-  source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
 }
 
 module "redis" {
-  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
 }
 
 module "csv_upload_bucket" {
-  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -78,7 +78,7 @@ module "sns_sms" {
 #     `cf create-domain gsa-tts-benefits-studio api.notify.gov`
 ###########################################################################
 # module "domain" {
-#   source = "github.com/18f/terraform-cloudgov//domain?ref=v0.2.0"
+#   source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.1"
 #
 #   cf_org_name      = local.cf_org_name
 #   cf_space_name    = local.cf_space_name
diff --git a/terraform/production/providers.tf b/terraform/production/providers.tf
index 360f648f4..499759f48 100644
--- a/terraform/production/providers.tf
+++ b/terraform/production/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.15.5"
+      version = "0.53.0"
     }
   }
 
@@ -12,7 +12,6 @@ terraform {
     key     = "api.tfstate.prod"
     encrypt = "true"
     region  = "us-gov-west-1"
-    profile = "notify-terraform-backend"
   }
 }
 
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 4076d3d53..fae30073c 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -7,7 +7,7 @@ locals {
 }
 
 module "database" {
-  source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
 }
 
 module "redis" {
-  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
 }
 
 module "csv_upload_bucket" {
-  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf
index 00ea2888d..d5a3313de 100644
--- a/terraform/sandbox/providers.tf
+++ b/terraform/sandbox/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.15.5"
+      version = "0.53.0"
     }
   }
 
@@ -12,7 +12,6 @@ terraform {
     key     = "api.tfstate.sandbox"
     encrypt = "true"
     region  = "us-gov-west-1"
-    profile = "notify-terraform-backend"
   }
 }
 
diff --git a/terraform/shared/egress_space/providers.tf b/terraform/shared/egress_space/providers.tf
index 8db86ca90..21ac567a2 100644
--- a/terraform/shared/egress_space/providers.tf
+++ b/terraform/shared/egress_space/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~> 0.15"
+      version = "0.53.0"
     }
   }
 }
diff --git a/terraform/shared/ses/providers.tf b/terraform/shared/ses/providers.tf
index 8db86ca90..21ac567a2 100644
--- a/terraform/shared/ses/providers.tf
+++ b/terraform/shared/ses/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~> 0.15"
+      version = "0.53.0"
     }
   }
 }
diff --git a/terraform/shared/sns/providers.tf b/terraform/shared/sns/providers.tf
index 8db86ca90..21ac567a2 100644
--- a/terraform/shared/sns/providers.tf
+++ b/terraform/shared/sns/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~> 0.15"
+      version = "0.53.0"
     }
   }
 }
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 414c18bc9..c46e0d3fa 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -7,7 +7,7 @@ locals {
 }
 
 module "database" {
-  source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -17,7 +17,7 @@ module "database" {
 }
 
 module "redis" {
-  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis" {
 }
 
 module "csv_upload_bucket" {
-  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
+  source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf
index 181b5fd69..11dceea7d 100644
--- a/terraform/staging/providers.tf
+++ b/terraform/staging/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.15.5"
+      version = "0.53.0"
     }
   }
 
@@ -12,7 +12,6 @@ terraform {
     key     = "api.tfstate.stage"
     encrypt = "true"
     region  = "us-gov-west-1"
-    profile = "notify-terraform-backend"
   }
 }