diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 99973c2f..cc654af9 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -890,6 +890,7 @@ jobs:
           TF_VAR_domain_name: fr-stage.cloud.gov
           TF_VAR_iaas_stack_name: staging
           TF_VAR_tooling_stack_name: tooling
+          TF_VAR_devtools_org_name: cloud-gov-devtools-development
       - put: slack
         params:
           text_file: terraform-state/message.txt
@@ -1474,6 +1475,7 @@ jobs:
           TF_VAR_domain_name: cloud.gov
           TF_VAR_iaas_stack_name: production
           TF_VAR_tooling_stack_name: tooling
+          TF_VAR_devtools_secondary_org: true
       - put: slack
         params:
           text_file: terraform-state/message.txt
diff --git a/terraform/stacks/cf/orgs.tf b/terraform/stacks/cf/orgs.tf
index 2a644835..c012f2ff 100644
--- a/terraform/stacks/cf/orgs.tf
+++ b/terraform/stacks/cf/orgs.tf
@@ -15,3 +15,14 @@ data "cloudfoundry_org" "cloud-gov-operators" {
 data "cloudfoundry_org" "gsa-18f-federalist" {
   name = "gsa-18f-federalist"
 }
+
+# Devtools
+
+resource "cloudfoundry_org" "cloud-gov-devtools" {
+  name = var.devtools_org_name
+}
+
+resource "cloudfoundry_org" "cloud-gov-devtools-secondary" {
+  count = var.devtools_secondary_org ? 1 : 0
+  name  = var.devtools_org_name_secondary
+}
diff --git a/terraform/stacks/cf/quotas.tf b/terraform/stacks/cf/quotas.tf
index 9d16f641..2eef5d0c 100644
--- a/terraform/stacks/cf/quotas.tf
+++ b/terraform/stacks/cf/quotas.tf
@@ -17,3 +17,23 @@ resource "cloudfoundry_space_quota" "tiny" {
   org                      = data.cloudfoundry_org.gsa-18f-federalist.id
   spaces                   = [cloudfoundry_space.email.id]
 }
+
+# Devtools
+
+resource "cloudfoundry_space_quota" "devtools" {
+  name                     = "devtools"
+  allow_paid_service_plans = true
+  total_memory             = 40960
+  total_routes             = 100
+  total_services           = 100
+  org                      = [cloudfoundry_org.cloud-gov-devtools.id]
+}
+
+resource "cloudfoundry_space_quota" "devtools-secondary" {
+  name                     = "devtools-secondary"
+  allow_paid_service_plans = true
+  total_memory             = 10240
+  total_routes             = 100
+  total_services           = 100
+  org                      = [cloudfoundry_org.cloud-gov-devtools-secondary.id]
+}
diff --git a/terraform/stacks/cf/variables.tf b/terraform/stacks/cf/variables.tf
index 036d09a2..45669536 100644
--- a/terraform/stacks/cf/variables.tf
+++ b/terraform/stacks/cf/variables.tf
@@ -9,3 +9,15 @@ variable "iaas_stack_name" {
 
 variable "domain_name" {
 }
+
+variable "devtools_org_name" {
+  default = "cloud-gov-devtools-production"
+}
+
+variable "devtools_secondary_org" {
+  default = false
+}
+
+variable "devtools_org_name_secondary" {
+  default = "cloud-gov-devtools-staging"
+}