diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 87c1e64dd..274be3206 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -26,6 +26,35 @@ module "redis-v70" {
   )
 }
 
+data "cloudfoundry_space" "space" {
+  provider = cloudfoundry.official
+  org      = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
+  name     = local.cf_space_name
+}
+
+
+# IF we want to upgrade from cloudfoundry communit to official,
+# we need to do something like what's commented out below
+#
+# We also need to run
+#
+# terraform state replace-provider \
+#   -auto-approve \
+#  -state=terraform.tfstate
+#  'registry.terraform.io/cloudfoundry-community/cloudfoundry' \
+#  'registry.terraform.io/cloudfoundry/cloudfoundry' \
+#  module.logo_upload_bucket (or something like that)
+# module "logo_upload_bucket" {
+# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
+# Right now the default is cfcommunity, remove this when default is cloudfoundry
+# providers = {
+# cloudfoundry = cloudfoundry.official
+# }
+# cf_space_id = data.cloudfoundry_space.space.id
+# name        = "${local.app_name}-logo-upload-bucket-${local.env}"
+# }
+
+
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
 
@@ -34,6 +63,7 @@ module "logo_upload_bucket" {
   name          = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
+
 module "api_network_route" {
   source = "../shared/container_networking"
 
diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf
index 95d1edaa5..e14251fdf 100644
--- a/terraform/staging/providers.tf
+++ b/terraform/staging/providers.tf
@@ -2,6 +2,10 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
+    }
+    cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
@@ -16,7 +20,16 @@ terraform {
   }
 }
 
+# Official provider (should be default but aliased for now)
 provider "cloudfoundry" {
+  alias    = "official"
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}
+
+# Community provider (should be aliased but default for now)
+provider "cfcommunity" {
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password