diff --git a/infra/terraform/test-org/ci-triggers/locals.tf b/infra/terraform/test-org/ci-triggers/locals.tf
index 170f2f2b14c..a62e2deac88 100644
--- a/infra/terraform/test-org/ci-triggers/locals.tf
+++ b/infra/terraform/test-org/ci-triggers/locals.tf
@@ -30,8 +30,6 @@ locals {
     "cloud-foundation-training"  = "cloud-foundation-training",
     "example-foundation-app"     = "terraform-example-foundation-app",
     "anthos-samples"             = "anthos-samples"
-    "cloud-deployment-gce"       = "terraform-cloud-deployment-gce",
-    "cloud-deployment-gke"       = "terraform-cloud-deployment-gke",
     "docs-samples"               = "terraform-docs-samples"
     "dynamic-python-webapp"      = "terraform-dynamic-python-webapp"
     "dynamic-javascript-webapp"  = "terraform-dynamic-javascript-webapp"
diff --git a/infra/terraform/test-org/org/folders.tf b/infra/terraform/test-org/org/folders.tf
index d23ccb65f24..acee3ae74ea 100644
--- a/infra/terraform/test-org/org/folders.tf
+++ b/infra/terraform/test-org/org/folders.tf
@@ -36,7 +36,8 @@ module "folders-ci" {
 
   names = [for module in [for repo in local.repos : try(repo.short_name, trimprefix(repo.name, "terraform-google-"))] : "ci-${module}"]
 
-  set_roles = false
+  set_roles           = false
+  deletion_protection = false
 }
 
 module "bpt_ci_folder" {
diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
index d054a24accb..66796eb7a66 100644
--- a/infra/terraform/test-org/org/locals.tf
+++ b/infra/terraform/test-org/org/locals.tf
@@ -798,28 +798,6 @@ locals {
       owners      = ["anaik91", "imrannayer"]
       topics      = local.common_topics.db
     },
-    {
-      name            = "terraform-cloud-deployment-gce"
-      short_name      = "cloud-deployment-gce"
-      org             = "GoogleCloudPlatform"
-      description     = "Deploy a change to a live stateful service (Java on GCE)"
-      groups          = ["team-egg", "dee-platform-ops", "dee-data-ai", local.jss_common_group]
-      enable_periodic = true
-      lint_env = {
-        ENABLE_BPMETADATA = "1"
-      }
-    },
-    {
-      name            = "terraform-cloud-deployment-gke"
-      short_name      = "cloud-deployment-gke"
-      org             = "GoogleCloudPlatform"
-      description     = "Deploy a change to a live stateful service (Go on GKE)"
-      groups          = ["team-egg", "dee-platform-ops", "dee-data-ai", local.jss_common_group]
-      enable_periodic = true
-      lint_env = {
-        ENABLE_BPMETADATA = "1"
-      }
-    },
     {
       name            = "terraform-pubsub-integration-golang"
       org             = "GoogleCloudPlatform"