diff --git a/terraform/bootstrap/main.tf b/terraform/bootstrap/main.tf
index a518530f1..ecc445429 100644
--- a/terraform/bootstrap/main.tf
+++ b/terraform/bootstrap/main.tf
@@ -3,7 +3,7 @@ locals {
 }
 
 module "s3" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_org_name   = "gsa-tts-benefits-studio"
   cf_space_name = "notify-management"
diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index d0b8ef92c..ddfc6b9be 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -13,7 +13,7 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
   cf_space_name   = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_org_name   = local.cf_org_name
   cf_space_name = local.cf_space_name
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 88e11139d..e5fe1c743 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -10,7 +10,7 @@ data "cloudfoundry_space" "dev" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_org_name   = local.cf_org_name
   cf_space_name = local.cf_space_name
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index a0d12fd27..3fd38c323 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -13,7 +13,7 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
   cf_space_name   = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_org_name   = local.cf_org_name
   cf_space_name = local.cf_space_name
@@ -57,7 +57,7 @@ module "api_network_route" {
 #       https://cloud.gov/docs/services/external-domain-service/#how-to-create-an-instance-of-this-service
 ###########################################################################
 module "domain" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v2.4.0"
 
   cf_org_name    = local.cf_org_name
   cf_space_name  = local.cf_space_name
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 76495b4c9..2ba534a51 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -13,7 +13,7 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
   cf_space_name   = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_org_name   = local.cf_org_name
   cf_space_name = local.cf_space_name
diff --git a/terraform/shared/container_networking/main.tf b/terraform/shared/container_networking/main.tf
index 69190fe9a..afec603c1 100644
--- a/terraform/shared/container_networking/main.tf
+++ b/terraform/shared/container_networking/main.tf
@@ -1,5 +1,5 @@
 data "cloudfoundry_space" "space" {
-  org  = var.cf_org_name
+  org  = 9e428562 - a2d9-41b4-9c23-1ef5237fb44e
   name = var.cf_space_name
 }
 
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 87c1e64dd..70f07c690 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -13,7 +13,7 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
   cf_space_name   = local.cf_space_name
@@ -27,7 +27,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_org_name   = local.cf_org_name
   cf_space_name = local.cf_space_name