diff --git a/yarn-project/aztec-dev-cli/src/key_derivation.ts b/yarn-project/aztec-dev-cli/src/key_derivation.ts
index 79fb26969..5349f8458 100644
--- a/yarn-project/aztec-dev-cli/src/key_derivation.ts
+++ b/yarn-project/aztec-dev-cli/src/key_derivation.ts
@@ -136,6 +136,7 @@ export function deriveDeploymentKeys(mnemonic: string) {
             { name: 'ROLLUP_PROVIDER', type: 'eth_keypair' },
           ],
         },
+        { name: 'SERVER_AUTH_TOKEN', type: 'base64', length: 16 },
       ],
     },
     {
diff --git a/yarn-project/falafel/terraform/dev/main.tf b/yarn-project/falafel/terraform/dev/main.tf
index 2723f691a..e9d34b854 100644
--- a/yarn-project/falafel/terraform/dev/main.tf
+++ b/yarn-project/falafel/terraform/dev/main.tf
@@ -181,7 +181,7 @@ resource "aws_ecs_task_definition" "falafel" {
       },
       {
         "name": "SERVER_AUTH_TOKEN",
-        "value": "!devnet#"
+        "value": "${var.DEV_SERVER_AUTH_TOKEN}"
       },
       {
         "name": "API_PREFIX",
diff --git a/yarn-project/falafel/terraform/dev/variables.tf b/yarn-project/falafel/terraform/dev/variables.tf
index 69ca613e3..fe185d3ec 100644
--- a/yarn-project/falafel/terraform/dev/variables.tf
+++ b/yarn-project/falafel/terraform/dev/variables.tf
@@ -9,3 +9,6 @@ variable "DEPLOY_TAG" {
 variable "DEV_KEBAB_API_KEY" {
   type = string
 }
+variable "DEV_SERVER_AUTH_TOKEN" {
+  type = string
+}
diff --git a/yarn-project/falafel/terraform/prod/main.tf b/yarn-project/falafel/terraform/prod/main.tf
index 0b28eaa8b..dab2530eb 100644
--- a/yarn-project/falafel/terraform/prod/main.tf
+++ b/yarn-project/falafel/terraform/prod/main.tf
@@ -181,7 +181,7 @@ resource "aws_ecs_task_definition" "falafel" {
       },
       {
         "name": "ETHEREUM_HOST",
-        "value": "https://mainnet.infura.io/v3/15bcbe21bd5043b48eb5b60fb6c563b8"
+        "value": "https://mainnet.infura.io/v3/${var.PROD_FALAFEL_INFURA_API_KEY}"
       },
       {
         "name": "ROLLUP_CONTRACT_ADDRESS",
diff --git a/yarn-project/falafel/terraform/prod/variables.tf b/yarn-project/falafel/terraform/prod/variables.tf
index 5053a2ade..c2597ed62 100644
--- a/yarn-project/falafel/terraform/prod/variables.tf
+++ b/yarn-project/falafel/terraform/prod/variables.tf
@@ -9,3 +9,7 @@ variable "PROD_SERVER_AUTH_TOKEN" {
 variable "DEPLOY_TAG" {
   type = string
 }
+
+variable "PROD_FALAFEL_INFURA_API_KEY" {
+  type = string
+}
diff --git a/yarn-project/kebab/terraform/prod/main.tf b/yarn-project/kebab/terraform/prod/main.tf
index 5cfd94237..d3cbfd387 100644
--- a/yarn-project/kebab/terraform/prod/main.tf
+++ b/yarn-project/kebab/terraform/prod/main.tf
@@ -129,7 +129,7 @@ resource "aws_ecs_task_definition" "kebab" {
       },
       {
         "name": "ETHEREUM_HOST",
-        "value": "https://mainnet.infura.io/v3/a3135f474fad4ce3868e5b92fc30ac40"
+        "value": "https://mainnet.infura.io/v3/${var.PROD_KEBAB_INFURA_API_KEY}"
       },
       {
         "name": "REDEPLOY",
diff --git a/yarn-project/kebab/terraform/prod/variables.tf b/yarn-project/kebab/terraform/prod/variables.tf
index 229c53356..020889646 100644
--- a/yarn-project/kebab/terraform/prod/variables.tf
+++ b/yarn-project/kebab/terraform/prod/variables.tf
@@ -1,3 +1,7 @@
 variable "DEPLOY_TAG" {
   type = string
-}
\ No newline at end of file
+}
+
+variable "PROD_KEBAB_INFURA_API_KEY" {
+  type = string
+}