diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index d30d2e6a3..51abd5bab 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=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
 
   cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
@@ -26,7 +26,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
 
   cf_space_id = local.cf_space_name
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 573337139..c3429d399 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=v2.3.0"
+  source      = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
   cf_space_id = local.cf_space_name
   name        = "${var.username}-logo-upload-bucket"
 }
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index c81f5c01c..4354589f3 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=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
 
   cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
@@ -26,7 +26,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
 
   cf_space_id = local.cf_space_name
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
@@ -55,7 +55,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=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v2.0.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 628a149ff..0543d1259 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=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
 
   cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
@@ -26,7 +26,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
 
   cf_space_id = local.cf_space_name
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
diff --git a/terraform/shared/container_networking/main.tf b/terraform/shared/container_networking/main.tf
index 796a7b245..d60df9129 100644
--- a/terraform/shared/container_networking/main.tf
+++ b/terraform/shared/container_networking/main.tf
@@ -1,5 +1,10 @@
+data "cloudfoundry_org" "org" {
+  name = var.cf_org_name
+}
+
 data "cloudfoundry_space" "space" {
-  org  = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
+  org = data.cloudfoundry_org.org.id
+  # org  = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
   name = var.cf_space_name
 }
 
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 207d7af18..9eebbae4c 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=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
 
   cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
@@ -26,7 +26,7 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.3.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
 
   cf_space_id = local.cf_space_name
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"