diff --git a/terraform/bootstrap/main.tf b/terraform/bootstrap/main.tf
index ecc445429..a518530f1 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=v2.4.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
 
   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 fe6e50a4b..7b9ce5c7f 100644
--- a/terraform/bootstrap/providers.tf
+++ b/terraform/bootstrap/providers.tf
@@ -2,15 +2,15 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry/cloudfoundry"
-      version = "1.9.0"
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
     }
   }
 }
 
 provider "cloudfoundry" {
-  api_url  = "https://api.fr.cloud.gov"
-  user     = var.cf_user
-  password = var.cf_password
-  # app_logs_max = 30
+  api_url      = "https://api.fr.cloud.gov"
+  user         = var.cf_user
+  password     = var.cf_password
+  app_logs_max = 30
 }
diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index 51abd5bab..d0b8ef92c 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -13,9 +13,10 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
 
-  cf_space_id     = local.cf_space_name
+  cf_org_name     = local.cf_org_name
+  cf_space_name   = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -26,10 +27,11 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
 
-  cf_space_id = local.cf_space_name
-  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_org_name   = local.cf_org_name
+  cf_space_name = local.cf_space_name
+  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf
index c7f430deb..3817eae91 100644
--- a/terraform/demo/providers.tf
+++ b/terraform/demo/providers.tf
@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry/cloudfoundry"
-      version = "1.9.0"
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
     }
   }
 
@@ -17,8 +17,8 @@ terraform {
 }
 
 provider "cloudfoundry" {
-  api_url  = "https://api.fr.cloud.gov"
-  user     = var.cf_user
-  password = var.cf_password
-  # app_logs_max = 30
+  api_url      = "https://api.fr.cloud.gov"
+  user         = var.cf_user
+  password     = var.cf_password
+  app_logs_max = 30
 }