diff --git a/deployment/live/cloudbuild/dev/terragrunt.hcl b/deployment/live/cloudbuild/dev/terragrunt.hcl
index fb7688c..496fd14 100644
--- a/deployment/live/cloudbuild/dev/terragrunt.hcl
+++ b/deployment/live/cloudbuild/dev/terragrunt.hcl
@@ -8,7 +8,7 @@ inputs = merge(
   {
     distributor_cloud_run_service = "distributor-service-dev"
     witness_cloud_run_service     = "witness-service-dev"
-    feeder_cloud_run_service     = "feeder-service-dev"
+    feeder_cloud_run_service      = "feeder-service-dev"
     slack_template_json           = file("slack.json")
   }
 )
diff --git a/deployment/live/cloudbuild/prod/terragrunt.hcl b/deployment/live/cloudbuild/prod/terragrunt.hcl
index cd8ccb3..329c2f5 100644
--- a/deployment/live/cloudbuild/prod/terragrunt.hcl
+++ b/deployment/live/cloudbuild/prod/terragrunt.hcl
@@ -6,8 +6,9 @@ include "root" {
 inputs = merge(
   include.root.locals,
   {
-    cloud_run_service   = "distributor-service-ci"
-    slack_template_json = file("slack.json")
+    distributor_cloud_run_service       = "distributor-service-ci"
+    feeder_cloud_run_service = "feeder-service-ci"
+    slack_template_json      = file("slack.json")
   }
 )
 
diff --git a/deployment/live/feeder/ci/terragrunt.hcl b/deployment/live/feeder/ci/terragrunt.hcl
new file mode 100644
index 0000000..09100de
--- /dev/null
+++ b/deployment/live/feeder/ci/terragrunt.hcl
@@ -0,0 +1,31 @@
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+  expose = true
+}
+
+locals {
+  ci_aw_ids = [
+    "76d180a9d59ea2165ba4417d96ff26f79f938116129519ec85f2a39473c65cb9",
+    "1decd179ab5784e3f8ee689af2d3b353ca8ce4d1e25abe8b50b9376af32233b7",
+    "66cea1a2e93c90692a697c4f36418f38d72287f65c842b883f3343bb0e27ab44",
+    "60be39b9426e7777190bc89af9b568021c1610cb9067cac15a1c30f188042a52",
+    "c412b97bcc4d8bac24be24f51931a009488e0e85a21bdba9d2f0c72c0d406a86",
+    "ea8a7b22bb1a6420464bab7a01f768f120cf237bb399b46d0973109059175264",
+  ]
+  ci_bastion_base = "https://bastion.glasklar.is"
+  ci_witness_urls = [for i in local.ci_aw_ids : format("%s/%s", local.ci_bastion_base, i)]
+
+  all_witness_urls = local.ci_witness_urls
+}
+
+inputs = merge(
+  include.root.locals,
+  {
+    feeder_docker_image = "us-central1-docker.pkg.dev/checkpoint-distributor/distributor-docker-dev/feeder:latest"
+    // We just want to update in the background, no need to send out a flood of requests.
+    max_qps = format("%0.2f", 1 / 30)
+    extra_args = [for w in local.all_witness_urls : "--witness_url=${w}"]
+    ephemeral = true
+  }
+)
+
diff --git a/deployment/live/feeder/dev/terragrunt.hcl b/deployment/live/feeder/dev/terragrunt.hcl
index 6760cba..6129827 100644
--- a/deployment/live/feeder/dev/terragrunt.hcl
+++ b/deployment/live/feeder/dev/terragrunt.hcl
@@ -8,33 +8,16 @@ locals {
     "https://api.transparency.dev/dev/witness/little-garden",
   ]
 
-  ci_aw_ids = [
-    "76d180a9d59ea2165ba4417d96ff26f79f938116129519ec85f2a39473c65cb9",
-    "1decd179ab5784e3f8ee689af2d3b353ca8ce4d1e25abe8b50b9376af32233b7",
-    "66cea1a2e93c90692a697c4f36418f38d72287f65c842b883f3343bb0e27ab44",
-    "60be39b9426e7777190bc89af9b568021c1610cb9067cac15a1c30f188042a52",
-    "c412b97bcc4d8bac24be24f51931a009488e0e85a21bdba9d2f0c72c0d406a86",
-    "ea8a7b22bb1a6420464bab7a01f768f120cf237bb399b46d0973109059175264",
-  ]
-  ci_bastion_base = "https://bastion.glasklar.is"
-  ci_witness_urls = [for i in local.ci_aw_ids : format("%s/%s", local.ci_bastion_base, i)]
-
-  all_witness_urls = setunion(local.dev_witness_urls, local.ci_witness_urls)
-
-  // We just want to update in the background, no need to send out a flood of requests.
-  max_qps = format("%0.2f", 1 / 30)
+  all_witness_urls = local.dev_witness_urls
 }
 
 inputs = merge(
   include.root.locals,
   {
     feeder_docker_image = "us-central1-docker.pkg.dev/checkpoint-distributor/distributor-docker-dev/feeder:latest"
-    extra_args = concat(
-      [for w in local.all_witness_urls : "--witness_url=${w}"],
-      [
-        "--max_qps=${local.max_qps}",
-      ]
-    )
+    // We just want to update in the background, no need to send out a flood of requests.
+    max_qps = format("%0.2f", 1 / 30)
+    extra_args = [for w in local.all_witness_urls : "--witness_url=${w}"]
     ephemeral = true
   }
 )
diff --git a/deployment/live/feeder/prod/terragrunt.hcl b/deployment/live/feeder/prod/terragrunt.hcl
new file mode 100644
index 0000000..d2ed73b
--- /dev/null
+++ b/deployment/live/feeder/prod/terragrunt.hcl
@@ -0,0 +1,40 @@
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+  expose = true
+}
+
+locals {
+  prod_aw_ids = [
+    "2d01a87850deb2b3dff94013d2d4d280504a2e72618940b8ee151c999bc42830",
+    "c664d70dc8cd2cbe40469224c66dd705d6eb67615c406b61a2579966127d0c7e",
+    "395c4b740cfbb722a66cbb1790bb9e70100e35518c8101b3dacf579765e4d220",
+    "2867895f07dfc47299cf7d2ced88ed5230a822a7f62d54f8402d6daf11520131",
+    "a3924e97756d78c4e1ae3f30b55fc508b3cc84c7fbab002334b2617143ce9009",
+    "5d4a576817f975218bf4f9ff8cf4400c2ee322f40c58a5ef2120d44d161d6f37",
+    "92c1c586ab85db6af4c27fc714c49a080366eb5e4d7f5b696eadb7e845e78362",
+    "b6d4eee9d6165e01a756bd4590ab29bc34265e2e83b580f54a19f4a458778cbc",
+    "9e18b190f219d9a9d3032d8b00807aa0c014948fb324d543057d82afa00ad15c",
+    "6365b85463db655dd4e224bdffa3dfd49fd49c9588b800718b4483799c324f5b",
+    "c77fe626a6b4d53738a9a37920095ee205eb48d1717c19092c4c25efe2f2cc50",
+    "989bb3b71551f35503b2a89798959f1a5d6e4cad2699133b2b49e54bc2a4fa68",
+    "ff7a3001c5895b13144b68a421e13513d94c40b151e0e22d56fcceb14f802c18",
+    "2777010fe71082f771ac21d700bd9f2ea55b5d8520d329a67867edcdb61e2fc2",
+    "478f82d5b9a76aa5b907f5ef52bd5a3b8f5e12353ef01ae16e9aa0d74979b9db",
+  ]
+  prod_bastion_base = "https://bastion.glasklar.is"
+  prod_witness_urls = [for i in local.prod_aw_ids : format("%s/%s", local.prod_bastion_base, i)]
+
+  all_witness_urls = local.prod_witness_urls
+}
+
+inputs = merge(
+  include.root.locals,
+  {
+    feeder_docker_image = "us-central1-docker.pkg.dev/checkpoint-distributor/distributor-docker-dev/feeder:latest"
+    // We just want to update in the background, no need to send out a flood of requests.
+    max_qps = format("%0.2f", 1 / 30)
+    extra_args = [for w in local.all_witness_urls : "--witness_url=${w}"]
+    ephemeral = true
+  }
+)
+
diff --git a/deployment/modules/cloudbuild/main.tf b/deployment/modules/cloudbuild/main.tf
index ee2ec86..0b2dfc0 100644
--- a/deployment/modules/cloudbuild/main.tf
+++ b/deployment/modules/cloudbuild/main.tf
@@ -140,6 +140,9 @@ resource "google_cloudbuild_trigger" "witness_docker" {
   service_account = google_service_account.cloudbuild_service_account.id
   location        = var.region
 
+  // Only create this trigger if the corresponding cloud run service is specified.
+  count = var.witness_cloud_run_service != null ? 1 : 0
+
   github {
     owner = "transparency-dev"
     name  = "witness"
@@ -240,6 +243,9 @@ resource "google_cloudbuild_trigger" "feeder_docker" {
   service_account = google_service_account.cloudbuild_service_account.id
   location        = var.region
 
+  // Only create this trigger if the corresponding cloud run service is specified.
+  count = var.feeder_cloud_run_service != null ? 1 : 0
+
   github {
     owner = "transparency-dev"
     name  = "witness"
diff --git a/deployment/modules/cloudbuild/variables.tf b/deployment/modules/cloudbuild/variables.tf
index b2167c7..b0e38b4 100644
--- a/deployment/modules/cloudbuild/variables.tf
+++ b/deployment/modules/cloudbuild/variables.tf
@@ -37,11 +37,13 @@ variable "distributor_cloud_run_service" {
 variable "witness_cloud_run_service" {
   description = "The name of the cloud run service running the witness that new witness images should be pushed to"
   type        = string
+  default     = null
 }
 
 variable "feeder_cloud_run_service" {
   description = "The name of the cloud run service running the feeder that new feeder images should be pushed to"
   type        = string
+  default     = null
 }
 
 variable "slack_template_json" {
diff --git a/deployment/modules/feeder/main.tf b/deployment/modules/feeder/main.tf
index 929bbb3..07b6574 100644
--- a/deployment/modules/feeder/main.tf
+++ b/deployment/modules/feeder/main.tf
@@ -76,6 +76,7 @@ resource "google_cloud_run_v2_service" "default" {
 
   template {
     service_account = google_service_account.cloudrun_service_account.email
+
     scaling {
       min_instance_count = 1
       max_instance_count = 1
@@ -89,10 +90,19 @@ resource "google_cloud_run_v2_service" "default" {
         "--metrics_listen=:8080",
         "--max_qps=${var.max_qps}",
       ], var.extra_args)
-     ports {
+      ports {
         container_port = 8080
       }
 
+      resources {
+        limits = {
+          cpu    = "1"
+          memory = "1024Mi"
+        }
+        // Since we do background processing, flag that we need to keep our CPU alloc even in the absence of incoming requests.
+        cpu_idle = false
+      }
+
       startup_probe {
         initial_delay_seconds = 1
         timeout_seconds       = 1
@@ -102,7 +112,6 @@ resource "google_cloud_run_v2_service" "default" {
           port = 8080
         }
       }
-
     }
     containers {
       image      = "us-docker.pkg.dev/cloud-ops-agents-artifacts/cloud-run-gmp-sidecar/cloud-run-gmp-sidecar:1.3.0"
diff --git a/deployment/modules/feeder/variables.tf b/deployment/modules/feeder/variables.tf
index 15b74a7..ae9c90c 100644
--- a/deployment/modules/feeder/variables.tf
+++ b/deployment/modules/feeder/variables.tf
@@ -48,7 +48,7 @@ variable "ephemeral" {
 
 variable "max_qps" {
   description = "Max qps to send to witnesses"
-  type = number
-  default = 2.0
+  type        = number
+  default     = 2.0
 }