diff --git a/yarn-project/aztec-faucet/terraform/variables.tf b/yarn-project/aztec-faucet/terraform/variables.tf
index ae556c6c842..42ed1838367 100644
--- a/yarn-project/aztec-faucet/terraform/variables.tf
+++ b/yarn-project/aztec-faucet/terraform/variables.tf
@@ -17,7 +17,8 @@ variable "API_PREFIX" {
 }
 
 variable "CHAIN_ID" {
-  type = string
+  type    = string
+  default = 31337
 }
 
 variable "FAUCET_PRIVATE_KEY" {
diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index e70980cb72c..4c5cdcb47df 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -140,6 +140,10 @@ resource "aws_ecs_task_definition" "aztec-node" {
         "name": "DEPLOY_TAG",
         "value": "${var.DEPLOY_TAG}"
       },
+      {
+        "name": "DEPLOY_AZTEC_CONTRACTS",
+        "value": "false"
+      },
       {
         "name": "AZTEC_NODE_PORT",
         "value": "80"
@@ -150,7 +154,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
       },
       {
         "name": "ETHEREUM_HOST",
-        "value": "testnet"
+        "value": "https://${var.DEPLOY_TAG}-mainnet-fork.aztec.network:8545/${var.API_KEY}"
       },
       {
         "name": "ARCHIVER_POLLING_INTERVAL",
diff --git a/yarn-project/ethereum/src/testnet.ts b/yarn-project/ethereum/src/testnet.ts
index 4c3694f9361..83deeddc164 100644
--- a/yarn-project/ethereum/src/testnet.ts
+++ b/yarn-project/ethereum/src/testnet.ts
@@ -2,11 +2,11 @@ import { Chain } from 'viem';
 
 import { EthereumChain } from './ethereum_chain.js';
 
-const { DEPLOY_TAG = 'aztec-dev' } = process.env;
+const { DEPLOY_TAG = 'aztec-dev', CHAIN_ID = 31337 } = process.env;
 
 export const createTestnetChain = (apiKey: string) => {
   const chain: Chain = {
-    id: 677868,
+    id: +CHAIN_ID,
     name: 'testnet',
     network: 'aztec',
     nativeCurrency: {