diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index c3429d399..82f03a6ef 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -5,25 +5,30 @@ locals {
 }
 
 data "cloudfoundry_space" "dev" {
-  org_name = local.cf_org_name
-  name     = local.cf_space_name
+  org  = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
+  name = local.cf_space_name
 }
 
 module "logo_upload_bucket" {
-  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"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+
+  cf_org_name   = local.cf_org_name
+  cf_space_name = local.cf_space_name
+  name          = "${var.username}-logo-upload-bucket"
 }
 resource "cloudfoundry_service_key" "logo_key" {
+
+  provider         = cloudfoundry-community.legacy
   name             = local.key_name
   service_instance = module.logo_upload_bucket.bucket_id
 }
 
 data "cloudfoundry_service_instance" "csv_bucket" {
-  name_or_id = "${var.username}-csv-upload-bucket"
-  space      = data.cloudfoundry_space.dev.id
+  name  = "${var.username}-csv-upload-bucket"
+  space = data.cloudfoundry_space.dev.id
 }
 resource "cloudfoundry_service_key" "csv_key" {
+  provider         = cloudfoundry-community.legacy
   name             = local.key_name
   service_instance = data.cloudfoundry_service_instance.csv_bucket.id
 }
diff --git a/terraform/development/providers.tf b/terraform/development/providers.tf
index fe6e50a4b..70e8701aa 100644
--- a/terraform/development/providers.tf
+++ b/terraform/development/providers.tf
@@ -5,12 +5,27 @@ terraform {
       source  = "cloudfoundry/cloudfoundry"
       version = "1.9.0"
     }
+    cloudfoundry-community = {
+      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
 }
+
+provider "cloudfoundry-community" {
+  alias        = "legacy"
+  api_url      = "https://api.fr.cloud.gov"
+  user         = var.cf_user
+  password     = var.cf_password
+  app_logs_max = 30
+}
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 9eebbae4c..1ac861f2f 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.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
@@ -26,7 +26,8 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
+  provider         = cloudfoundry-community.legacy
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
   cf_space_id = local.cf_space_name
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf
index 40914117d..3613c3d7c 100644
--- a/terraform/staging/providers.tf
+++ b/terraform/staging/providers.tf
@@ -5,6 +5,10 @@ terraform {
       source  = "cloudfoundry/cloudfoundry"
       version = "1.9.0"
     }
+    cloudfoundry-community = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
+    }
   }
 
   backend "s3" {
@@ -22,3 +26,11 @@ provider "cloudfoundry" {
   password = var.cf_password
   # app_logs_max = 30
 }
+
+provider "cloudfoundry-community" {
+  alias        = "legacy"
+  api_url      = "https://api.fr.cloud.gov"
+  user         = var.cf_user
+  password     = var.cf_password
+  app_logs_max = 30
+}