diff --git a/l1-contracts/src/governance/Governance.sol b/l1-contracts/src/governance/Governance.sol
index 32bc7485557d..da7488433f6d 100644
--- a/l1-contracts/src/governance/Governance.sol
+++ b/l1-contracts/src/governance/Governance.sol
@@ -48,13 +48,13 @@ contract Governance is IGovernance {
 
     configuration = DataStructures.Configuration({
       proposeConfig: DataStructures.ProposeConfiguration({
-        lockDelay: Timestamp.wrap(3600),
+        lockDelay: Timestamp.wrap(60),
         lockAmount: 1000e18
       }),
-      votingDelay: Timestamp.wrap(3600),
-      votingDuration: Timestamp.wrap(3600),
-      executionDelay: Timestamp.wrap(3600),
-      gracePeriod: Timestamp.wrap(3600),
+      votingDelay: Timestamp.wrap(60),
+      votingDuration: Timestamp.wrap(60),
+      executionDelay: Timestamp.wrap(60),
+      gracePeriod: Timestamp.wrap(60),
       quorum: 0.1e18,
       voteDifferential: 0.04e18,
       minimumVotes: 1000e18
diff --git a/l1-contracts/src/governance/libraries/ConfigurationLib.sol b/l1-contracts/src/governance/libraries/ConfigurationLib.sol
index 482dee7ff901..9e542ed7c888 100644
--- a/l1-contracts/src/governance/libraries/ConfigurationLib.sol
+++ b/l1-contracts/src/governance/libraries/ConfigurationLib.sol
@@ -16,7 +16,7 @@ library ConfigurationLib {
 
   uint256 internal constant VOTES_LOWER = 1;
 
-  Timestamp internal constant TIME_LOWER = Timestamp.wrap(3600);
+  Timestamp internal constant TIME_LOWER = Timestamp.wrap(60);
   Timestamp internal constant TIME_UPPER = Timestamp.wrap(30 * 24 * 3600);
 
   function withdrawalDelay(DataStructures.Configuration storage _self)
diff --git a/l1-contracts/src/governance/libraries/DataStructures.sol b/l1-contracts/src/governance/libraries/DataStructures.sol
index 5e18aa9d90eb..9c8062d27539 100644
--- a/l1-contracts/src/governance/libraries/DataStructures.sol
+++ b/l1-contracts/src/governance/libraries/DataStructures.sol
@@ -44,6 +44,7 @@ library DataStructures {
     uint256 nea;
   }
 
+  // @notice if this changes, please update the enum in governance.ts
   enum ProposalState {
     Pending,
     Active,
diff --git a/l1-contracts/test/governance/governance/finaliseWithdraw.t.sol b/l1-contracts/test/governance/governance/finaliseWithdraw.t.sol
index ae437f23c223..71eb413adb93 100644
--- a/l1-contracts/test/governance/governance/finaliseWithdraw.t.sol
+++ b/l1-contracts/test/governance/governance/finaliseWithdraw.t.sol
@@ -98,6 +98,9 @@ contract FinaliseWithdrawTest is GovernanceBase {
     uint256 withdrawalCount = governance.withdrawalCount();
     for (uint256 i = 0; i < withdrawalCount; i++) {
       DataStructures.Withdrawal memory withdrawal = governance.getWithdrawal(i);
+      if (Timestamp.unwrap(withdrawal.unlocksAt) <= block.timestamp) {
+        continue;
+      }
       assertGt(withdrawal.unlocksAt, block.timestamp);
 
       uint256 time =
diff --git a/spartan/aztec-network/files/config/config-prover-env.sh b/spartan/aztec-network/files/config/config-prover-env.sh
index 073547821d48..e8cc47b46d1c 100644
--- a/spartan/aztec-network/files/config/config-prover-env.sh
+++ b/spartan/aztec-network/files/config/config-prover-env.sh
@@ -7,7 +7,11 @@ output=$(node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js get-no
 
 echo "$output"
 
-boot_node_enr=$(echo "$output" | grep -oP 'Node ENR: \Kenr:[a-zA-Z0-9\-\_\.]+')
+boot_node_enr=""
+if [ "$P2P_ENABLED" = "true" ]; then
+  # Only look for boot node ENR if P2P is enabled
+  boot_node_enr=$(echo "$output" | grep -oP 'Node ENR: \Kenr:[a-zA-Z0-9\-\_\.]+')
+fi
 rollup_address=$(echo "$output" | grep -oP 'Rollup Address: \K0x[a-fA-F0-9]{40}')
 registry_address=$(echo "$output" | grep -oP 'Registry Address: \K0x[a-fA-F0-9]{40}')
 inbox_address=$(echo "$output" | grep -oP 'L1 -> L2 Inbox Address: \K0x[a-fA-F0-9]{40}')
diff --git a/spartan/aztec-network/files/config/config-validator-env.sh b/spartan/aztec-network/files/config/config-validator-env.sh
index c584a0d2d237..368ce98b93f0 100644
--- a/spartan/aztec-network/files/config/config-validator-env.sh
+++ b/spartan/aztec-network/files/config/config-validator-env.sh
@@ -7,7 +7,11 @@ output=$(node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js get-no
 
 echo "$output"
 
-boot_node_enr=$(echo "$output" | grep -oP 'Node ENR: \Kenr:[a-zA-Z0-9\-\_\.]+')
+boot_node_enr=""
+if [ "$P2P_ENABLED" = "true" ]; then
+  # Only look for boot node ENR if P2P is enabled
+  boot_node_enr=$(echo "$output" | grep -oP 'Node ENR: \Kenr:[a-zA-Z0-9\-\_\.]+')
+fi
 rollup_address=$(echo "$output" | grep -oP 'Rollup Address: \K0x[a-fA-F0-9]{40}')
 registry_address=$(echo "$output" | grep -oP 'Registry Address: \K0x[a-fA-F0-9]{40}')
 inbox_address=$(echo "$output" | grep -oP 'L1 -> L2 Inbox Address: \K0x[a-fA-F0-9]{40}')
diff --git a/spartan/aztec-network/files/config/deploy-l1-contracts.sh b/spartan/aztec-network/files/config/deploy-l1-contracts.sh
index c3a9b761c4ed..3ff6801d0091 100755
--- a/spartan/aztec-network/files/config/deploy-l1-contracts.sh
+++ b/spartan/aztec-network/files/config/deploy-l1-contracts.sh
@@ -1,6 +1,17 @@
 #!/bin/bash
 set -exu
 
+# If REGISTRY_CONTRACT_ADDRESS is already set, skip deployment and just write the file
+if [ -n "${REGISTRY_CONTRACT_ADDRESS:-}" ]; then
+  echo "Registry address already set. Skipping deployment."
+  # Write the addresses to a file in the shared volume
+  cat <<EOF >/shared/contracts/contracts.env
+export REGISTRY_CONTRACT_ADDRESS=$REGISTRY_CONTRACT_ADDRESS
+EOF
+  cat /shared/contracts/contracts.env
+  exit 0
+fi
+
 SALT=${1:-$RANDOM}
 CHAIN_ID=$2
 VALIDATOR_ADDRESSES=$3
@@ -9,10 +20,15 @@ VALIDATOR_ADDRESSES=$3
 output=""
 MAX_RETRIES=5
 RETRY_DELAY=15
+TEST_ACCOUNTS=${TEST_ACCOUNTS:-false}
+TEST_ACCOUNTS_ARG=""
+if [ "$TEST_ACCOUNTS" = "true" ]; then
+  TEST_ACCOUNTS_ARG="--test-accounts"
+fi
 
 for attempt in $(seq 1 $MAX_RETRIES); do
   # Construct base command
-  base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts --test-accounts"
+  base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG"
 
   # Add account - use private key if set, otherwise use mnemonic
   if [ -n "${L1_DEPLOYMENT_PRIVATE_KEY:-}" ]; then
@@ -38,32 +54,12 @@ done || {
 echo "$output"
 
 # Extract contract addresses using grep and regex
-rollup_address=$(echo "$output" | grep -oP 'Rollup Address: \K0x[a-fA-F0-9]{40}')
 registry_address=$(echo "$output" | grep -oP 'Registry Address: \K0x[a-fA-F0-9]{40}')
-inbox_address=$(echo "$output" | grep -oP 'L1 -> L2 Inbox Address: \K0x[a-fA-F0-9]{40}')
-outbox_address=$(echo "$output" | grep -oP 'L2 -> L1 Outbox Address: \K0x[a-fA-F0-9]{40}')
-fee_juice_address=$(echo "$output" | grep -oP 'Fee Juice Address: \K0x[a-fA-F0-9]{40}')
-staking_asset_address=$(echo "$output" | grep -oP 'Staking Asset Address: \K0x[a-fA-F0-9]{40}')
-fee_juice_portal_address=$(echo "$output" | grep -oP 'Fee Juice Portal Address: \K0x[a-fA-F0-9]{40}')
-coin_issuer_address=$(echo "$output" | grep -oP 'CoinIssuer Address: \K0x[a-fA-F0-9]{40}')
-reward_distributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
-governance_proposer_address=$(echo "$output" | grep -oP 'GovernanceProposer Address: \K0x[a-fA-F0-9]{40}')
-governance_address=$(echo "$output" | grep -oP 'Governance Address: \K0x[a-fA-F0-9]{40}')
 slash_factory_address=$(echo "$output" | grep -oP 'SlashFactory Address: \K0x[a-fA-F0-9]{40}')
 
 # Write the addresses to a file in the shared volume
 cat <<EOF >/shared/contracts/contracts.env
-export ROLLUP_CONTRACT_ADDRESS=$rollup_address
 export REGISTRY_CONTRACT_ADDRESS=$registry_address
-export INBOX_CONTRACT_ADDRESS=$inbox_address
-export OUTBOX_CONTRACT_ADDRESS=$outbox_address
-export FEE_JUICE_CONTRACT_ADDRESS=$fee_juice_address
-export STAKING_ASSET_CONTRACT_ADDRESS=$staking_asset_address
-export FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$fee_juice_portal_address
-export COIN_ISSUER_CONTRACT_ADDRESS=$coin_issuer_address
-export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$reward_distributor_address
-export GOVERNANCE_PROPOSER_CONTRACT_ADDRESS=$governance_proposer_address
-export GOVERNANCE_CONTRACT_ADDRESS=$governance_address
 export SLASH_FACTORY_CONTRACT_ADDRESS=$slash_factory_address
 EOF
 
diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
index ee87b5fcfca3..ab3d17c4857f 100644
--- a/spartan/aztec-network/templates/boot-node.yaml
+++ b/spartan/aztec-network/templates/boot-node.yaml
@@ -76,7 +76,6 @@ spec:
           volumeMounts:
             - name: config
               mountPath: /shared/config
-      {{- if .Values.bootNode.deployContracts }}
         - name: deploy-l1-contracts
           {{- include "aztec-network.image" . | nindent 10 }}
           command:
@@ -99,6 +98,10 @@ spec:
             - name: scripts
               mountPath: /scripts
           env:
+            - name: TEST_ACCOUNTS
+              value: "{{ .Values.aztec.testAccounts }}"
+            - name: REGISTRY_CONTRACT_ADDRESS
+              value: "{{ .Values.bootNode.contracts.registryAddress }}"
             - name: TELEMETRY
               value: "{{ .Values.telemetry.enabled }}"
             - name: INIT_VALIDATORS
@@ -133,7 +136,6 @@ spec:
                   fieldPath: metadata.namespace
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-      {{- end }}
       containers:
         - name: boot-node
           {{- include "aztec-network.image" . | nindent 10 }}
@@ -168,14 +170,8 @@ spec:
               mountPath: /shared/config
             - name: boot-node-data
               mountPath: {{ .Values.bootNode.dataDir }}
-            {{- if .Values.bootNode.deployContracts }}
             - name: scripts-output
               mountPath: /shared/contracts
-            {{- else }}
-            - name: contracts-env
-              mountPath: /shared/contracts/contracts.env
-              subPath: contracts.env
-            {{- end }}
           env:
             - name: POD_IP
               valueFrom:
@@ -253,6 +249,8 @@ spec:
               value: "{{ .Values.telemetry.useGcloudLogging }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
+            - name: TEST_ACCOUNTS
+              value: "{{ .Values.aztec.testAccounts }}"
             {{- if .Values.blobSink.enabled }}
             - name: BLOB_SINK_URL
               value: {{ include "aztec-network.blobSinkUrl" . }}
@@ -277,35 +275,11 @@ spec:
           persistentVolumeClaim:
             claimName: boot-node-data
       {{- end }}
-      {{- if .Values.bootNode.deployContracts }}
         - name: scripts
           configMap:
             name: {{ include "aztec-network.fullname" . }}-scripts
         - name: scripts-output
           emptyDir: {}
-      {{- else }}
-        - name: contracts-env
-          configMap:
-            name: {{ include "aztec-network.fullname" . }}-contracts-env
-      {{- end }}
-{{- if not .Values.bootNode.deployContracts }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "aztec-network.fullname" . }}-contracts-env
-  labels:
-    {{- include "aztec-network.labels" . | nindent 4 }}
-data:
-  contracts.env: |
-    export ROLLUP_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.rollupAddress }}
-    export REGISTRY_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.registryAddress }}
-    export INBOX_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.inboxAddress }}
-    export OUTBOX_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.outboxAddress }}
-    export FEE_JUICE_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.feeJuiceAddress }}
-    export STAKING_ASSET_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.stakingAssetAddress }}
-    export FEE_JUICE_PORTAL_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.feeJuicePortalAddress }}
-{{- end }}
 ---
 # Headless service for StatefulSet DNS entries
 apiVersion: v1
diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml
index 6e09de1f2403..f8647627a3ab 100644
--- a/spartan/aztec-network/templates/prover-node.yaml
+++ b/spartan/aztec-network/templates/prover-node.yaml
@@ -113,6 +113,9 @@ spec:
               mountPath: /scripts
             - name: config
               mountPath: /shared/config
+          env:
+            - name: P2P_ENABLED
+              value: "{{ .Values.proverNode.p2p.enabled }}"
 
       containers:
         - name: prover-node
@@ -225,6 +228,8 @@ spec:
               value: "{{ .Values.telemetry.useGcloudLogging }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
+            - name: TEST_ACCOUNTS
+              value: "{{ .Values.aztec.testAccounts }}"
             {{- if .Values.blobSink.enabled }}
             - name: BLOB_SINK_URL
               value: {{ include "aztec-network.blobSinkUrl" . }}
diff --git a/spartan/aztec-network/templates/pxe.yaml b/spartan/aztec-network/templates/pxe.yaml
index 14bfc3f0371e..30755072acd6 100644
--- a/spartan/aztec-network/templates/pxe.yaml
+++ b/spartan/aztec-network/templates/pxe.yaml
@@ -117,6 +117,8 @@ spec:
               value: "{{ .Values.telemetry.excludeMetrics }}"
             - name: L1_CHAIN_ID
               value: "{{ .Values.ethereum.chainId }}"
+            - name: TEST_ACCOUNTS
+              value: "{{ .Values.aztec.testAccounts }}"
           ports:
             - name: http
               containerPort: {{ .Values.pxe.service.nodePort }}
diff --git a/spartan/aztec-network/templates/setup-l2-contracts.yaml b/spartan/aztec-network/templates/setup-l2-contracts.yaml
index c08e53296ef8..7cebe0b4ae8b 100644
--- a/spartan/aztec-network/templates/setup-l2-contracts.yaml
+++ b/spartan/aztec-network/templates/setup-l2-contracts.yaml
@@ -65,7 +65,7 @@ spec:
               done
               echo "PXE service is ready!"
               set -e
-              node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js setup-protocol-contracts --skipProofWait
+              LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js setup-protocol-contracts --skipProofWait
               echo "L2 contracts initialized"
           env:
             - name: K8S_POD_UID
diff --git a/spartan/aztec-network/templates/transaction-bot.yaml b/spartan/aztec-network/templates/transaction-bot.yaml
index 38a806f29e23..00e310bbbd0e 100644
--- a/spartan/aztec-network/templates/transaction-bot.yaml
+++ b/spartan/aztec-network/templates/transaction-bot.yaml
@@ -164,6 +164,8 @@ spec:
               value: "{{ .Values.telemetry.excludeMetrics }}"
             - name: L1_CHAIN_ID
               value: "{{ .Values.ethereum.chainId }}"
+            - name: TEST_ACCOUNTS
+              value: "{{ .Values.aztec.testAccounts }}"
           ports:
             - name: http
               containerPort: {{ .Values.bot.service.nodePort }}
diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
index 09b57ded0c6d..f71c4acefb39 100644
--- a/spartan/aztec-network/templates/validator.yaml
+++ b/spartan/aztec-network/templates/validator.yaml
@@ -117,6 +117,9 @@ spec:
               mountPath: /scripts
             - name: config
               mountPath: /shared/config
+          env:
+            - name: P2P_ENABLED
+              value: "{{ .Values.validator.p2p.enabled }}"
       containers:
         - name: validator
           {{- include "aztec-network.image" . | nindent 10 }}
@@ -237,6 +240,8 @@ spec:
               value: "{{ .Values.telemetry.useGcloudLogging }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
+            - name: TEST_ACCOUNTS
+              value: "{{ .Values.aztec.testAccounts }}"
             {{- if .Values.blobSink.enabled }}
             - name: BLOB_SINK_URL
               value: {{ include "aztec-network.blobSinkUrl" . }}
diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
index f692c552b07f..43baad434de8 100644
--- a/spartan/aztec-network/values.yaml
+++ b/spartan/aztec-network/values.yaml
@@ -59,7 +59,8 @@ aztec:
   extraAccounts: 10
 
   botKeyIndexStart: 3000
-  l1Salt: "" # leave empty for random salt
+  l1Salt: "42" # leave empty for random salt
+  testAccounts: true
 
 bootNode:
   peerIdPrivateKey: ""
diff --git a/spartan/aztec-network/values/1-validators.yaml b/spartan/aztec-network/values/1-validators.yaml
index ba3d9e14e3e7..31a5692f2d2b 100644
--- a/spartan/aztec-network/values/1-validators.yaml
+++ b/spartan/aztec-network/values/1-validators.yaml
@@ -3,6 +3,8 @@ telemetry:
 
 validator:
   replicas: 1
+  sequencer:
+    minTxsPerBlock: 0
   validator:
     disabled: false
 
diff --git a/spartan/bootstrap.sh b/spartan/bootstrap.sh
index 47609095be92..17e2c51503b5 100755
--- a/spartan/bootstrap.sh
+++ b/spartan/bootstrap.sh
@@ -61,6 +61,7 @@ function test_cmds {
     echo "$hash timeout -v 20m ./spartan/bootstrap.sh test-kind-transfer"
     echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-kind-4epochs"
     echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-kind-transfer-blob-with-sink"
+    echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-kind-upgrade-rollup-version"
   fi
 }
 
@@ -129,6 +130,10 @@ case "$cmd" in
     # export OVERRIDES="blobSink.enabled=true"
     ./bootstrap.sh test-kind-transfer
     ;;
+  "test-kind-upgrade-rollup-version")
+    export OVERRIDES="bot.enabled=false"
+    NAMESPACE=upgrade-rollup-version FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false ./scripts/test_kind.sh src/spartan/upgrade_rollup_version.test.ts ci.yaml
+    ;;
   "test-local")
     # Isolate network stack in docker.
     docker_isolate ../scripts/run_native_testnet.sh -i -val 3
diff --git a/spartan/scripts/deploy_kind.sh b/spartan/scripts/deploy_kind.sh
index c057eabc7eb2..1b4890a9fdaa 100755
--- a/spartan/scripts/deploy_kind.sh
+++ b/spartan/scripts/deploy_kind.sh
@@ -9,6 +9,9 @@
 #   AZTEC_DOCKER_TAG (default: current git commit)
 #   INSTALL_TIMEOUT (default: 30m)
 #   OVERRIDES (default: "", no overrides)
+#
+# Note on OVERRIDES:
+# You can use like OVERRIDES="replicas=3,resources.limits.cpu=1"
 
 source $(git rev-parse --show-toplevel)/ci3/source
 
@@ -18,6 +21,7 @@ set -x
 namespace="$1"
 values_file="${2:-default.yaml}"
 sepolia_deployment="${3:-false}"
+helm_instance="${4:-spartan}"
 
 # Default values for environment variables
 chaos_values="${CHAOS_VALUES:-}"
@@ -90,9 +94,9 @@ fi
 
 # Install the Helm chart
 echo "Cleaning up any existing Helm releases..."
-helm uninstall spartan -n "$namespace" 2>/dev/null || true
-kubectl delete clusterrole spartan-aztec-network-node 2>/dev/null || true
-kubectl delete clusterrolebinding spartan-aztec-network-node 2>/dev/null || true
+helm uninstall "$helm_instance" -n "$namespace" 2>/dev/null || true
+kubectl delete clusterrole "$helm_instance"-aztec-network-node 2>/dev/null || true
+kubectl delete clusterrolebinding "$helm_instance"-aztec-network-node 2>/dev/null || true
 
 helm_set_args=(
   --set images.aztec.image="aztecprotocol/aztec:$aztec_docker_tag"
@@ -118,7 +122,7 @@ if [ "$sepolia_deployment" = "true" ]; then
   set -x
 fi
 
-helm upgrade --install spartan ../aztec-network \
+helm upgrade --install "$helm_instance" ../aztec-network \
   --namespace "$namespace" \
   --create-namespace \
   "${helm_set_args[@]}" \
diff --git a/spartan/scripts/test_kind.sh b/spartan/scripts/test_kind.sh
index 5f0a6b4bea8e..fc3db8451161 100755
--- a/spartan/scripts/test_kind.sh
+++ b/spartan/scripts/test_kind.sh
@@ -24,6 +24,7 @@ set -x
 # Main positional parameter
 test=$1
 values_file="${2:-default.yaml}"
+helm_instance="${3:-spartan}"
 
 # Default values for environment variables
 namespace="${NAMESPACE:-test-kind}"
@@ -74,7 +75,7 @@ trap cleanup SIGINT SIGTERM EXIT
 stern_pid=""
 function copy_stern_to_log {
   # Start stern in a subshell, capture its PID, and pipe output to cache_log so it is uploaded
-  stern spartan -n "$namespace" >"logs/kind-$namespace.log" &>/dev/null &
+  stern "$helm_instance" -n "$namespace" >"logs/kind-$namespace.log" &>/dev/null &
   stern_pid=$!
 }
 
@@ -83,7 +84,7 @@ copy_stern_to_log
 
 # uses VALUES_FILE, CHAOS_VALUES, AZTEC_DOCKER_TAG and INSTALL_TIMEOUT optional env vars
 if [ "$fresh_install" != "no-deploy" ]; then
-  deploy_result=$(OVERRIDES="$OVERRIDES" ./deploy_kind.sh $namespace $values_file $sepolia_run)
+  deploy_result=$(OVERRIDES="$OVERRIDES" ./deploy_kind.sh $namespace $values_file $sepolia_run $helm_instance)
 fi
 
 # Find 6 free ports between 9000 and 10000
@@ -124,7 +125,7 @@ fi
 echo "RUNNING TEST: $test"
 # Run test locally.
 export K8S="local"
-export INSTANCE_NAME="spartan"
+export INSTANCE_NAME="$helm_instance"
 export SPARTAN_DIR="$(pwd)/.."
 export NAMESPACE="$namespace"
 export HOST_PXE_PORT="$forwarded_pxe_port"
diff --git a/spartan/scripts/upgrade_rollup_with_lock.sh b/spartan/scripts/upgrade_rollup_with_lock.sh
new file mode 100755
index 000000000000..128604fe4f79
--- /dev/null
+++ b/spartan/scripts/upgrade_rollup_with_lock.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+set -exu
+
+# NOTICE: This script is intended for non-production (i.e. testnet) use only.
+
+# Deploys a new rollup contract and uses proposeWithLock to propose an upgrade.
+# It then waits for the proposal to be active, and then votes in favor of it.
+# Finally it waits for the proposal to be executable, and then executes it.
+#
+# It will also optionally mint/deposit governance tokens.
+#
+# Example usage:
+#
+# L1_CHAIN_ID=1337 \
+# ETHEREUM_HOST=http://localhost:8545 \
+# MNEMONIC="test test test test test test test test test test test junk" \
+# ./upgrade_rollup_with_lock.sh \
+#   --aztec-docker-tag c5e2b43044862882a68de47cac07b7116e74e51e \
+#   --registry 0x29f815e32efdef19883cf2b92a766b7aebadd326 \
+#   --address 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266 \
+#   --deposit-amount 200000000000000000000000 \
+#   --mint
+#
+# where:
+#  - aztec-docker-tag is the tag of the aztec docker image to use.
+#  - registry is the address of the registry contract.
+#  - address is the address that corresponds to whatever mnemonic/private key you are using.
+#  - deposit-amount is optional, and if provided, will deposit the specified amount of governance tokens to the address.
+#  - mint is optional, and if provided, will mint the governance tokens to the address before depositing.
+#
+# It can also be used locally by providing an --aztec-bin argument to the path of the aztec binary.
+# For example, --aztec-bin /usr/src/yarn-project/aztec/dest/bin/index.js
+
+# export AZTEC_BIN=/home/mitch/aztec-clones/alpha/yarn-project/aztec/dest/bin/index.js
+# L1_CHAIN_ID=1337 \
+# ./spartan/scripts/upgrade_rollup_with_lock.sh \
+#   --aztec-bin $AZTEC_BIN \
+#   --registry 0x29f815e32efdef19883cf2b92a766b7aebadd326 \
+#   --address 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266 \
+#   --deposit-amount 10000000000000000 \
+#   --mint
+
+# First set from environment variables if they exist
+DEPOSIT_AMOUNT=""
+MINT=""
+SALT=$((RANDOM % 1000000))
+# The default path to the aztec binary within the docker image
+AZTEC_BIN="/usr/src/yarn-project/aztec/dest/bin/index.js"
+AZTEC_DOCKER_TAG=""
+
+# Parse command line arguments (these will override env vars if provided)
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --aztec-docker-tag)
+      AZTEC_DOCKER_TAG="$2"
+      shift 2
+      ;;
+    --aztec-bin)
+      AZTEC_BIN="$2"
+      shift 2
+      ;;
+    --deposit-amount)
+      DEPOSIT_AMOUNT="$2"
+      shift 2
+      ;;
+    --salt)
+      SALT="$2"
+      shift 2
+      ;;
+    --registry)
+      REGISTRY="$2"
+      shift 2
+      ;;
+    --address)
+      MY_ADDR="$2"
+      shift 2
+      ;;
+    --mint)
+      MINT="--mint"
+      shift 1
+      ;;
+    *)
+      echo "Unknown parameter: $1"
+      exit 1
+      ;;
+  esac
+done
+
+# Validate required arguments
+if [ -z "$REGISTRY" ]; then
+    echo "Error: --registry argument is required"
+    exit 1
+fi
+
+if [ -z "$MY_ADDR" ]; then
+    echo "Error: --address argument is required"
+    exit 1
+fi
+
+# Only need this in the docker case
+cleanup() {
+  # Add error handling and force removal
+  rm -rf .env.tmp 2>/dev/null || true
+}
+
+# if aztec-docker-tag is set, use it
+if [ -n "$AZTEC_DOCKER_TAG" ]; then
+  IMAGE_NAME="aztecprotocol/aztec:${AZTEC_DOCKER_TAG}"
+  EXE="docker run --rm --network=host --env-file .env.tmp $IMAGE_NAME $AZTEC_BIN"
+  # Check if the image exists locally before pulling it
+  if ! docker images $IMAGE_NAME -q; then
+    echo "Pulling docker image $IMAGE_NAME"
+    docker pull $IMAGE_NAME
+  fi
+  trap cleanup EXIT INT TERM HUP QUIT
+  # Create a temporary .env file
+  env > .env.tmp
+else
+  EXE="node --no-warnings $AZTEC_BIN"
+fi
+
+
+# if DEPOSIT_AMOUNT is set, we deposit governance tokens
+if [ -n "$DEPOSIT_AMOUNT" ]; then
+  echo "Depositing $DEPOSIT_AMOUNT governance tokens to $MY_ADDR"
+  $EXE deposit-governance-tokens -r $REGISTRY --recipient $MY_ADDR -a $DEPOSIT_AMOUNT $MINT
+fi
+
+PAYLOAD=$($EXE deploy-new-rollup -r $REGISTRY --salt $SALT --json --test-accounts | jq -r '.payloadAddress')
+
+PROPOSAL_ID=$($EXE propose-with-lock -r $REGISTRY --payload-address $PAYLOAD --json | jq -r '.proposalId')
+
+$EXE vote-on-governance-proposal --proposal-id $PROPOSAL_ID --in-favor true --wait true -r $REGISTRY
+
+$EXE execute-governance-proposal --proposal-id $PROPOSAL_ID --wait true -r $REGISTRY
diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts
index f3e5c3c681b4..1515136b2f6f 100644
--- a/yarn-project/archiver/src/archiver/archiver.ts
+++ b/yarn-project/archiver/src/archiver/archiver.ts
@@ -180,7 +180,7 @@ export class Archiver implements ArchiveSource, Traceable {
     }
 
     if (blockUntilSynced) {
-      await this.sync(blockUntilSynced);
+      await this.syncSafe(blockUntilSynced);
     }
 
     this.runningPromise = new RunningPromise(
@@ -198,6 +198,14 @@ export class Archiver implements ArchiveSource, Traceable {
     this.runningPromise.start();
   }
 
+  private async syncSafe(initialRun: boolean) {
+    try {
+      await this.sync(initialRun);
+    } catch (error) {
+      this.log.error('Error during sync', { error });
+    }
+  }
+
   /**
    * Fetches logs from L1 contracts and processes them.
    */
diff --git a/yarn-project/aztec/src/cli/cmds/start_archiver.ts b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
index b0cf79be47ac..0ca8943a2497 100644
--- a/yarn-project/aztec/src/cli/cmds/start_archiver.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
@@ -1,10 +1,4 @@
-import {
-  Archiver,
-  type ArchiverConfig,
-  KVArchiverDataStore,
-  archiverConfigMappings,
-  getArchiverConfigFromEnv,
-} from '@aztec/archiver';
+import { Archiver, type ArchiverConfig, KVArchiverDataStore, archiverConfigMappings } from '@aztec/archiver';
 import { createLogger } from '@aztec/aztec.js';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
@@ -13,8 +7,8 @@ import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 
+import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
-import { validateL1Config } from '../validation.js';
 
 export type { ArchiverConfig, DataStoreConfig };
 
@@ -24,7 +18,7 @@ export async function startArchiver(
   signalHandlers: (() => Promise<void>)[],
   services: NamespacedApiHandlers,
 ): Promise<{ config: ArchiverConfig & DataStoreConfig }> {
-  const archiverConfig = extractRelevantOptions<ArchiverConfig & DataStoreConfig>(
+  let archiverConfig = extractRelevantOptions<ArchiverConfig & DataStoreConfig>(
     options,
     {
       ...archiverConfigMappings,
@@ -33,7 +27,18 @@ export async function startArchiver(
     'archiver',
   );
 
-  await validateL1Config({ ...getArchiverConfigFromEnv(), ...archiverConfig });
+  if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
+    throw new Error('L1 registry address is required to start an Archiver');
+  }
+
+  const { addresses, config } = await getL1Config(
+    archiverConfig.l1Contracts.registryAddress,
+    archiverConfig.l1RpcUrls,
+    archiverConfig.l1ChainId,
+  );
+
+  archiverConfig.l1Contracts = addresses;
+  archiverConfig = { ...archiverConfig, ...config };
 
   const storeLog = createLogger('archiver:lmdb');
   const store = await createStore('archiver', archiverConfig, storeLog);
diff --git a/yarn-project/aztec/src/cli/cmds/start_node.ts b/yarn-project/aztec/src/cli/cmds/start_node.ts
index 6e399295af6f..04f449db7a46 100644
--- a/yarn-project/aztec/src/cli/cmds/start_node.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_node.ts
@@ -1,9 +1,5 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import {
-  type AztecNodeConfig,
-  aztecNodeConfigMappings,
-  getConfigEnvVars as getNodeConfigEnvVars,
-} from '@aztec/aztec-node';
+import { type AztecNodeConfig, aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
 import { NULL_KEY } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
@@ -19,8 +15,8 @@ import { getGenesisValues } from '@aztec/world-state/testing';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
 import { createAztecNode, deployContractsToL1 } from '../../sandbox.js';
+import { getL1Config } from '../get_l1_config.js';
 import { extractNamespacedOptions, extractRelevantOptions } from '../util.js';
-import { validateL1Config } from '../validation.js';
 
 export async function startNode(
   options: any,
@@ -31,7 +27,8 @@ export async function startNode(
   // options specifically namespaced with --node.<option>
   const nodeSpecificOptions = extractNamespacedOptions(options, 'node');
   // All options that are relevant to the Aztec Node
-  const nodeConfig = {
+  let nodeConfig: AztecNodeConfig = {
+    ...getConfigEnvVars(),
     ...extractRelevantOptions(options, aztecNodeConfigMappings, 'node'),
   };
 
@@ -63,11 +60,26 @@ export async function startNode(
       genesisArchiveRoot,
     });
   }
-  // If not deploying, validate that the addresses and config provided are correct.
-  // Eventually, we should be able to dynamically load this just by having the L1 governance address,
-  // instead of only validating the config the user has entered.
+  // If not deploying, validate that any addresses and config provided are correct.
   else {
-    await validateL1Config({ ...getNodeConfigEnvVars(), ...nodeConfig });
+    if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
+      throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
+    }
+    const { addresses, config } = await getL1Config(
+      nodeConfig.l1Contracts.registryAddress,
+      nodeConfig.l1RpcUrls,
+      nodeConfig.l1ChainId,
+    );
+
+    // TODO(#12272): will clean this up.
+    nodeConfig = {
+      ...nodeConfig,
+      l1Contracts: {
+        ...addresses,
+        slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
+      },
+      ...config,
+    };
   }
 
   // if no publisher private key, then use l1Mnemonic
diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_node.ts b/yarn-project/aztec/src/cli/cmds/start_prover_node.ts
index f3bc722807a3..f135b953a9dc 100644
--- a/yarn-project/aztec/src/cli/cmds/start_prover_node.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_prover_node.ts
@@ -17,8 +17,8 @@ import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { mnemonicToAccount } from 'viem/accounts';
 
+import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
-import { validateL1Config } from '../validation.js';
 import { getVersions } from '../versioning.js';
 import { startProverBroker } from './start_prover_broker.js';
 
@@ -33,7 +33,7 @@ export async function startProverNode(
     process.exit(1);
   }
 
-  const proverConfig = {
+  let proverConfig = {
     ...getProverNodeConfigFromEnv(), // get default config from env
     ...extractRelevantOptions<ProverNodeConfig>(options, proverNodeConfigMappings, 'proverNode'), // override with command line options
   };
@@ -66,7 +66,16 @@ export async function startProverNode(
 
   // If we create an archiver here, validate the L1 config
   if (options.archiver) {
-    await validateL1Config(proverConfig);
+    if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
+      throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
+    }
+    const { addresses, config } = await getL1Config(
+      proverConfig.l1Contracts.registryAddress,
+      proverConfig.l1RpcUrls,
+      proverConfig.l1ChainId,
+    );
+    proverConfig.l1Contracts = addresses;
+    proverConfig = { ...proverConfig, ...config };
   }
 
   const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
diff --git a/yarn-project/aztec/src/cli/get_l1_config.ts b/yarn-project/aztec/src/cli/get_l1_config.ts
new file mode 100644
index 000000000000..80335d810c5b
--- /dev/null
+++ b/yarn-project/aztec/src/cli/get_l1_config.ts
@@ -0,0 +1,18 @@
+import { type L1ContractAddresses, RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+
+export async function getL1Config(
+  registryAddress: EthAddress,
+  l1RpcUrls: string[],
+  l1ChainId: number,
+): Promise<{ addresses: L1ContractAddresses; config: Awaited<ReturnType<typeof getL1ContractsConfig>> }> {
+  const publicClient = getPublicClient({ l1RpcUrls, l1ChainId });
+  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
+
+  const config = await getL1ContractsConfig(publicClient, addresses);
+
+  return {
+    addresses,
+    config,
+  };
+}
diff --git a/yarn-project/aztec/src/cli/validation.test.ts b/yarn-project/aztec/src/cli/validation.test.ts
deleted file mode 100644
index 5b5a29fcfcd7..000000000000
--- a/yarn-project/aztec/src/cli/validation.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { type AztecNodeConfig, aztecNodeConfigMappings } from '@aztec/aztec-node';
-import { createLogger } from '@aztec/aztec.js';
-import { startAnvil } from '@aztec/ethereum/test';
-import { getDefaultConfig } from '@aztec/foundation/config';
-import { EthAddress } from '@aztec/foundation/eth-address';
-
-import type { Anvil } from '@viem/anvil';
-import { mnemonicToAccount } from 'viem/accounts';
-
-import { DefaultMnemonic } from '../mnemonic.js';
-import { deployContractsToL1 } from '../sandbox.js';
-import { validateL1Config } from './validation.js';
-
-describe('validation', () => {
-  describe('L1 config', () => {
-    let anvil: Anvil;
-    let l1RpcUrl: string;
-    let nodeConfig: AztecNodeConfig;
-
-    beforeAll(async () => {
-      ({ anvil, rpcUrl: l1RpcUrl } = await startAnvil());
-
-      nodeConfig = { ...getDefaultConfig(aztecNodeConfigMappings), l1RpcUrls: [l1RpcUrl] };
-      nodeConfig.aztecSlotDuration = 72; // Tweak config so we don't have just defaults
-      const account = mnemonicToAccount(DefaultMnemonic);
-      const deployed = await deployContractsToL1(nodeConfig, account, undefined, { salt: 1 });
-      nodeConfig.l1Contracts = deployed;
-    });
-
-    afterAll(async () => {
-      await anvil.stop().catch(err => createLogger('cleanup').error(err));
-    });
-
-    it('validates correct config', async () => {
-      await validateL1Config(nodeConfig);
-    });
-
-    it('throws on invalid l1 settings', async () => {
-      await expect(validateL1Config({ ...nodeConfig, aztecSlotDuration: 96 })).rejects.toThrow(/aztecSlotDuration/);
-    });
-
-    it('throws on mismatching l1 addresses', async () => {
-      const wrongL1Contracts = { ...nodeConfig.l1Contracts, feeJuicePortalAddress: EthAddress.random() };
-      const wrongConfig = { ...nodeConfig, l1Contracts: wrongL1Contracts };
-      await expect(validateL1Config(wrongConfig)).rejects.toThrow(/feeJuicePortalAddress/);
-    });
-  });
-});
diff --git a/yarn-project/aztec/src/cli/validation.ts b/yarn-project/aztec/src/cli/validation.ts
deleted file mode 100644
index 070dabd89a99..000000000000
--- a/yarn-project/aztec/src/cli/validation.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
-  type L1ContractAddresses,
-  type L1ContractsConfig,
-  getL1ContractsAddresses,
-  getL1ContractsConfig,
-  getPublicClient,
-} from '@aztec/ethereum';
-
-/**
- * Connects to L1 using the provided L1 RPC URL and reads all addresses and settings from the governance
- * contract. For each key, compares it against the provided config (if it is not empty) and throws on mismatches.
- */
-export async function validateL1Config(
-  config: L1ContractsConfig & { l1Contracts: L1ContractAddresses } & { l1ChainId: number; l1RpcUrls: string[] },
-) {
-  const publicClient = getPublicClient(config);
-  const actualAddresses = await getL1ContractsAddresses(publicClient, config.l1Contracts.governanceAddress);
-
-  for (const keyStr in actualAddresses) {
-    const key = keyStr as keyof Awaited<ReturnType<typeof getL1ContractsAddresses>>;
-    const actual = actualAddresses[key];
-    const expected = config.l1Contracts[key];
-
-    if (expected !== undefined && !expected.isZero() && !actual.equals(expected)) {
-      throw new Error(`Expected L1 contract address ${key} to be ${expected} but found ${actual}`);
-    }
-  }
-
-  const actualConfig = await getL1ContractsConfig(publicClient, actualAddresses);
-  for (const keyStr in actualConfig) {
-    const key = keyStr as keyof Awaited<ReturnType<typeof getL1ContractsConfig>> & keyof L1ContractsConfig;
-    const actual = actualConfig[key];
-    const expected = config[key];
-    if (expected !== undefined && actual !== expected) {
-      throw new Error(`Expected L1 setting ${key} to be ${expected} but found ${actual}`);
-    }
-  }
-}
diff --git a/yarn-project/aztec/src/sandbox.ts b/yarn-project/aztec/src/sandbox.ts
index 8547f430f242..902333ba4d84 100644
--- a/yarn-project/aztec/src/sandbox.ts
+++ b/yarn-project/aztec/src/sandbox.ts
@@ -264,7 +264,14 @@ export async function createAztecNode(
   deps: { telemetry?: TelemetryClient; blobSinkClient?: BlobSinkClientInterface } = {},
   options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
 ) {
-  const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars(), ...config };
+  // TODO(#12272): will clean this up. This is criminal.
+  const { l1Contracts, ...rest } = getConfigEnvVars();
+  const aztecNodeConfig: AztecNodeConfig = {
+    ...rest,
+    ...config,
+    l1Contracts: { ...l1Contracts, ...config.l1Contracts },
+  };
+  logger.info('createAztecNode', aztecNodeConfig);
   const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
   return node;
 }
diff --git a/yarn-project/aztec/src/test/upgrade.test.ts b/yarn-project/aztec/src/test/upgrade.test.ts
new file mode 100644
index 000000000000..0464aa6efdfb
--- /dev/null
+++ b/yarn-project/aztec/src/test/upgrade.test.ts
@@ -0,0 +1,7 @@
+// TODO(#12333): Implement upgrade tests
+// Also, needed to add this file so that `aztec/src/**/*.test.ts` as invoked in `yarn-project/bootstrap.sh` is not empty.
+describe('Upgrade', () => {
+  it('should upgrade', () => {
+    expect(true).toBe(true);
+  });
+});
diff --git a/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts b/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts
new file mode 100644
index 000000000000..13b6f5f97ebe
--- /dev/null
+++ b/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts
@@ -0,0 +1,58 @@
+import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { LogFn, Logger } from '@aztec/foundation/log';
+import { getGenesisValues } from '@aztec/world-state/testing';
+
+import { deployNewRollupContracts } from '../../utils/aztec.js';
+
+export async function deployNewRollup(
+  registryAddress: EthAddress,
+  rpcUrls: string[],
+  chainId: number,
+  privateKey: string | undefined,
+  mnemonic: string,
+  mnemonicIndex: number,
+  salt: number | undefined,
+  testAccounts: boolean,
+  json: boolean,
+  initialValidators: EthAddress[],
+  log: LogFn,
+  debugLogger: Logger,
+) {
+  const config = getL1ContractsConfigEnvVars();
+
+  const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
+
+  const { payloadAddress, rollup } = await deployNewRollupContracts(
+    registryAddress,
+    rpcUrls,
+    chainId,
+    privateKey,
+    mnemonic,
+    mnemonicIndex,
+    salt,
+    initialValidators,
+    genesisArchiveRoot,
+    genesisBlockHash,
+    config,
+    debugLogger,
+  );
+
+  if (json) {
+    log(
+      JSON.stringify(
+        {
+          payloadAddress: payloadAddress.toString(),
+          rollupAddress: rollup.address,
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    log(`Payload Address: ${payloadAddress.toString()}`);
+    log(`Rollup Address: ${rollup.address}`);
+  }
+}
diff --git a/yarn-project/cli/src/cmds/l1/get_l1_addresses.ts b/yarn-project/cli/src/cmds/l1/get_l1_addresses.ts
new file mode 100644
index 000000000000..6b0c693e9c67
--- /dev/null
+++ b/yarn-project/cli/src/cmds/l1/get_l1_addresses.ts
@@ -0,0 +1,30 @@
+import { EthAddress } from '@aztec/aztec.js';
+import { RegistryContract, type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
+import type { LogFn } from '@aztec/foundation/log';
+
+import { createPublicClient, fallback, http } from 'viem';
+
+export async function getL1Addresses(
+  registryAddress: EthAddress,
+  rollupVersion: number | bigint | 'canonical',
+  rpcUrls: string[],
+  chainId: number,
+  json: boolean,
+  log: LogFn,
+) {
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const publicClient: ViemPublicClient = createPublicClient({
+    chain: chain.chainInfo,
+    transport: fallback(rpcUrls.map(url => http(url))),
+    pollingInterval: 100,
+  });
+  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress.toString(), rollupVersion);
+
+  if (json) {
+    log(JSON.stringify(addresses, null, 2));
+  } else {
+    for (const [key, value] of Object.entries(addresses)) {
+      log(`${key}: ${value.toString()}`);
+    }
+  }
+}
diff --git a/yarn-project/cli/src/cmds/l1/governance_utils.ts b/yarn-project/cli/src/cmds/l1/governance_utils.ts
new file mode 100644
index 000000000000..c10c0248b1f5
--- /dev/null
+++ b/yarn-project/cli/src/cmds/l1/governance_utils.ts
@@ -0,0 +1,187 @@
+import {
+  FeeJuiceContract,
+  GovernanceContract,
+  ProposalState,
+  RegistryContract,
+  createEthereumChain,
+  createL1Clients,
+} from '@aztec/ethereum';
+import type { LogFn, Logger } from '@aztec/foundation/log';
+
+export async function depositGovernanceTokens({
+  registryAddress,
+  rpcUrls,
+  chainId,
+  privateKey,
+  mnemonic,
+  mnemonicIndex,
+  recipient,
+  amount,
+  debugLogger,
+  mint,
+}: {
+  registryAddress: `0x${string}`;
+  rpcUrls: string[];
+  chainId: number;
+  privateKey: string | undefined;
+  mnemonic: string;
+  mnemonicIndex: number;
+  recipient: `0x${string}`;
+  amount: bigint;
+  debugLogger: Logger;
+  mint: boolean;
+}) {
+  debugLogger.info(`Depositing ${amount} governance tokens to ${recipient}`);
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const { publicClient, walletClient } = createL1Clients(
+    rpcUrls,
+    privateKey ?? mnemonic,
+    chain.chainInfo,
+    mnemonicIndex,
+  );
+
+  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
+  const governanceAddress = addresses.governanceAddress.toString();
+  const tokenAddress = addresses.feeJuiceAddress.toString();
+
+  const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
+  const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);
+  if (mint) {
+    await feeJuice.mint(recipient, amount);
+    debugLogger.info(`Minted ${amount} tokens to ${recipient}`);
+  }
+
+  await feeJuice.approve(governanceAddress, amount);
+  debugLogger.info(`Approved ${amount} tokens for governance`);
+
+  await governance.deposit(recipient, amount);
+  debugLogger.info(`Deposited ${amount} tokens to ${recipient}`);
+}
+
+export async function proposeWithLock({
+  payloadAddress,
+  registryAddress,
+  rpcUrls,
+  chainId,
+  privateKey,
+  mnemonic,
+  mnemonicIndex,
+  json,
+  debugLogger,
+  log,
+}: {
+  payloadAddress: `0x${string}`;
+  registryAddress: `0x${string}`;
+  rpcUrls: string[];
+  chainId: number;
+  privateKey: string | undefined;
+  mnemonic: string;
+  mnemonicIndex: number;
+  debugLogger: Logger;
+  log: LogFn;
+  json: boolean;
+}) {
+  debugLogger.info(`Proposing with lock from ${payloadAddress} to ${registryAddress}`);
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
+
+  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+  const governanceAddress = addresses.governanceAddress.toString();
+
+  const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+
+  const proposalId = await governance.proposeWithLock({
+    payloadAddress,
+    withdrawAddress: clients.walletClient.account.address,
+  });
+  if (json) {
+    log(JSON.stringify({ proposalId }, null, 2));
+  } else {
+    log(`Proposed with lock`);
+    log(`Proposal ID: ${proposalId}`);
+  }
+}
+
+export async function voteOnGovernanceProposal({
+  proposalId,
+  voteAmount,
+  inFavor,
+  waitTilActive,
+  registryAddress,
+  rpcUrls,
+  chainId,
+  privateKey,
+  mnemonic,
+  mnemonicIndex,
+  debugLogger,
+}: {
+  proposalId: bigint;
+  voteAmount: bigint | undefined;
+  inFavor: boolean;
+  waitTilActive: boolean;
+  registryAddress: `0x${string}`;
+  rpcUrls: string[];
+  chainId: number;
+  privateKey: string | undefined;
+  mnemonic: string;
+  mnemonicIndex: number;
+  debugLogger: Logger;
+}) {
+  debugLogger.info(
+    `Voting on proposal ${proposalId} with ${voteAmount ? voteAmount : 'all'} tokens in favor: ${inFavor}`,
+  );
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
+
+  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+  const governanceAddress = addresses.governanceAddress.toString();
+
+  const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+  const state = await governance.getProposalState(proposalId);
+  if (state !== ProposalState.Active && !waitTilActive) {
+    debugLogger.warn(`Proposal is not active, but waitTilActive is false. Not voting.`);
+    return;
+  }
+
+  await governance.awaitProposalActive({ proposalId, logger: debugLogger });
+  await governance.vote({ proposalId, voteAmount, inFavor, retries: 10, logger: debugLogger });
+}
+
+export async function executeGovernanceProposal({
+  proposalId,
+  waitTilExecutable,
+  registryAddress,
+  rpcUrls,
+  chainId,
+  privateKey,
+  mnemonic,
+  mnemonicIndex,
+  debugLogger,
+}: {
+  proposalId: bigint;
+  waitTilExecutable: boolean;
+  registryAddress: `0x${string}`;
+  rpcUrls: string[];
+  chainId: number;
+  privateKey: string | undefined;
+  mnemonic: string;
+  mnemonicIndex: number;
+  debugLogger: Logger;
+}) {
+  debugLogger.info(`Executing proposal ${proposalId}`);
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
+
+  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+  const governanceAddress = addresses.governanceAddress.toString();
+
+  const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+  const state = await governance.getProposalState(proposalId);
+  if (state !== ProposalState.Executable && !waitTilExecutable) {
+    debugLogger.warn(`Proposal is not executable, but waitTilExecutable is false. Not executing.`);
+    return;
+  }
+
+  await governance.awaitProposalExecutable({ proposalId, logger: debugLogger });
+  await governance.executeProposal({ proposalId, retries: 10, logger: debugLogger });
+}
diff --git a/yarn-project/cli/src/cmds/l1/index.ts b/yarn-project/cli/src/cmds/l1/index.ts
index 90208eec6352..1b8cd88c41c7 100644
--- a/yarn-project/cli/src/cmds/l1/index.ts
+++ b/yarn-project/cli/src/cmds/l1/index.ts
@@ -62,6 +62,204 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       );
     });
 
+  program
+    .command('deploy-new-rollup')
+    .description('Deploys a new rollup contract and a payload to upgrade the registry with it.')
+    .requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress)
+    .addOption(l1RpcUrlsOption)
+    .option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY)
+    .option('--validators <string>', 'Comma separated list of validators')
+    .option(
+      '-m, --mnemonic <string>',
+      'The mnemonic to use in deployment',
+      'test test test test test test test test test test test junk',
+    )
+    .option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', arg => parseInt(arg), 0)
+    .addOption(l1ChainIdOption)
+    .option('--salt <number>', 'The optional salt to use in deployment', arg => parseInt(arg))
+    .option('--json', 'Output the contract addresses in JSON format')
+    .option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts')
+    .action(async options => {
+      const { deployNewRollup } = await import('./deploy_new_rollup.js');
+
+      const initialValidators =
+        options.validators?.split(',').map((validator: string) => EthAddress.fromString(validator)) || [];
+      await deployNewRollup(
+        options.registryAddress,
+        options.l1RpcUrls,
+        options.l1ChainId,
+        options.privateKey,
+        options.mnemonic,
+        options.mnemonicIndex,
+        options.salt,
+        options.testAccounts,
+        options.json,
+        initialValidators,
+        log,
+        debugLogger,
+      );
+    });
+
+  program
+    .command('deposit-governance-tokens')
+    .description('Deposits governance tokens to the governance contract.')
+    .requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress)
+    .requiredOption('--recipient <string>', 'The recipient of the tokens', parseEthereumAddress)
+    .requiredOption('-a, --amount <string>', 'The amount of tokens to deposit', parseBigint)
+    .option('--mint', 'Mint the tokens on L1', false)
+    .addOption(l1RpcUrlsOption)
+    .addOption(l1ChainIdOption)
+    .option('-p, --private-key <string>', 'The private key to use to deposit', PRIVATE_KEY)
+    .option(
+      '-m, --mnemonic <string>',
+      'The mnemonic to use to deposit',
+      'test test test test test test test test test test test junk',
+    )
+    .option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to deposit', arg => parseInt(arg), 0)
+    .action(async options => {
+      const { depositGovernanceTokens } = await import('./governance_utils.js');
+      await depositGovernanceTokens({
+        registryAddress: options.registryAddress.toString(),
+        recipient: options.recipient.toString(),
+        amount: options.amount,
+        mint: options.mint,
+        rpcUrls: options.l1RpcUrls,
+        chainId: options.l1ChainId,
+        privateKey: options.privateKey,
+        mnemonic: options.mnemonic,
+        mnemonicIndex: options.mnemonicIndex,
+        debugLogger,
+      });
+    });
+
+  program
+    .command('propose-with-lock')
+    .description('Makes a proposal to governance with a lock')
+    .requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress)
+    .requiredOption('-p, --payload-address <string>', 'The address of the payload contract', parseEthereumAddress)
+    .addOption(l1RpcUrlsOption)
+    .addOption(l1ChainIdOption)
+    .option('-pk, --private-key <string>', 'The private key to use to propose', PRIVATE_KEY)
+    .option(
+      '-m, --mnemonic <string>',
+      'The mnemonic to use to propose',
+      'test test test test test test test test test test test junk',
+    )
+    .option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to propose', arg => parseInt(arg), 0)
+    .option('--json', 'Output the proposal ID in JSON format')
+    .action(async options => {
+      const { proposeWithLock } = await import('./governance_utils.js');
+      await proposeWithLock({
+        payloadAddress: options.payloadAddress.toString(),
+        registryAddress: options.registryAddress.toString(),
+        rpcUrls: options.l1RpcUrls,
+        chainId: options.l1ChainId,
+        privateKey: options.privateKey,
+        mnemonic: options.mnemonic,
+        mnemonicIndex: options.mnemonicIndex,
+        debugLogger: debugLogger,
+        json: options.json,
+        log,
+      });
+    });
+
+  program
+    .command('vote-on-governance-proposal')
+    .description('Votes on a governance proposal.')
+    .requiredOption('-p, --proposal-id <string>', 'The ID of the proposal', parseBigint)
+    .option('-a, --vote-amount <string>', 'The amount of tokens to vote', parseBigint)
+    .requiredOption(
+      '--in-favor <boolean>',
+      'Whether to vote in favor of the proposal. Use "yea" for true, any other value for false.',
+      arg => arg === 'yea' || arg === 'true' || arg === '1' || arg === 'yes',
+    )
+    .requiredOption('--wait <boolean>', 'Whether to wait until the proposal is active', arg => arg === 'true')
+    .requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress)
+    .addOption(l1RpcUrlsOption)
+    .addOption(l1ChainIdOption)
+    .option('-pk, --private-key <string>', 'The private key to use to vote', PRIVATE_KEY)
+    .option(
+      '-m, --mnemonic <string>',
+      'The mnemonic to use to vote',
+      'test test test test test test test test test test test junk',
+    )
+    .option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to vote', arg => parseInt(arg), 0)
+    .action(async options => {
+      const { voteOnGovernanceProposal } = await import('./governance_utils.js');
+      await voteOnGovernanceProposal({
+        proposalId: options.proposalId,
+        voteAmount: options.voteAmount,
+        inFavor: options.inFavor,
+        waitTilActive: options.wait,
+        registryAddress: options.registryAddress.toString(),
+        rpcUrls: options.l1RpcUrls,
+        chainId: options.l1ChainId,
+        privateKey: options.privateKey,
+        mnemonic: options.mnemonic,
+        mnemonicIndex: options.mnemonicIndex,
+        debugLogger,
+      });
+    });
+
+  program
+    .command('execute-governance-proposal')
+    .description('Executes a governance proposal.')
+    .requiredOption('-p, --proposal-id <string>', 'The ID of the proposal', parseBigint)
+    .requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress)
+    .requiredOption('--wait <boolean>', 'Whether to wait until the proposal is executable', arg => arg === 'true')
+    .addOption(l1RpcUrlsOption)
+    .addOption(l1ChainIdOption)
+    .option('-pk, --private-key <string>', 'The private key to use to vote', PRIVATE_KEY)
+    .option(
+      '-m, --mnemonic <string>',
+      'The mnemonic to use to vote',
+      'test test test test test test test test test test test junk',
+    )
+    .option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to vote', arg => parseInt(arg), 0)
+    .action(async options => {
+      const { executeGovernanceProposal } = await import('./governance_utils.js');
+      await executeGovernanceProposal({
+        proposalId: options.proposalId,
+        registryAddress: options.registryAddress.toString(),
+        waitTilExecutable: options.wait,
+        rpcUrls: options.l1RpcUrls,
+        chainId: options.l1ChainId,
+        privateKey: options.privateKey,
+        mnemonic: options.mnemonic,
+        mnemonicIndex: options.mnemonicIndex,
+        debugLogger,
+      });
+    });
+
+  program
+    .command('get-l1-addresses')
+    .description('Gets the addresses of the L1 contracts.')
+    .requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress)
+    .addOption(l1RpcUrlsOption)
+    .requiredOption('-v, --rollup-version <number>', 'The version of the rollup', arg => {
+      if (arg === 'canonical' || arg === 'latest' || arg === '') {
+        return 'canonical';
+      }
+      const version = parseInt(arg);
+      if (isNaN(version)) {
+        throw new Error('Invalid rollup version');
+      }
+      return version;
+    })
+    .addOption(l1ChainIdOption)
+    .option('--json', 'Output the addresses in JSON format')
+    .action(async options => {
+      const { getL1Addresses } = await import('./get_l1_addresses.js');
+      await getL1Addresses(
+        options.registryAddress,
+        options.rollupVersion,
+        options.l1RpcUrls,
+        options.l1ChainId,
+        options.json,
+        log,
+      );
+    });
+
   program
     .command('generate-l1-account')
     .description('Generates a new private key for an account on L1.')
diff --git a/yarn-project/cli/src/utils/aztec.ts b/yarn-project/cli/src/utils/aztec.ts
index dd61ea38ec9a..620e7db7814d 100644
--- a/yarn-project/cli/src/utils/aztec.ts
+++ b/yarn-project/cli/src/utils/aztec.ts
@@ -1,12 +1,11 @@
+import type { EthAddress, PXE } from '@aztec/aztec.js';
 import { type ContractArtifact, type FunctionArtifact, loadContractArtifact } from '@aztec/aztec.js/abi';
-import type { DeployL1ContractsReturnType, L1ContractsConfig } from '@aztec/ethereum';
-import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { DeployL1ContractsReturnType, L1ContractsConfig, RollupContract } from '@aztec/ethereum';
 import type { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
 import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { FunctionType } from '@aztec/stdlib/abi';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
@@ -77,6 +76,50 @@ export async function deployAztecContracts(
   );
 }
 
+export async function deployNewRollupContracts(
+  registryAddress: EthAddress,
+  rpcUrls: string[],
+  chainId: number,
+  privateKey: string | undefined,
+  mnemonic: string,
+  mnemonicIndex: number,
+  salt: number | undefined,
+  initialValidators: EthAddress[],
+  genesisArchiveRoot: Fr,
+  genesisBlockHash: Fr,
+  config: L1ContractsConfig,
+  logger: Logger,
+): Promise<{ payloadAddress: EthAddress; rollup: RollupContract }> {
+  const { createEthereumChain, deployRollupAndPeriphery, createL1Clients } = await import('@aztec/ethereum');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
+
+  const account = !privateKey
+    ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
+    : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
+
+  const { payloadAddress, rollup } = await deployRollupAndPeriphery(
+    clients,
+    {
+      salt,
+      vkTreeRoot: getVKTreeRoot(),
+      protocolContractTreeRoot,
+      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
+      genesisArchiveRoot,
+      genesisBlockHash,
+      initialValidators,
+      ...config,
+    },
+    registryAddress,
+    logger,
+    config,
+  );
+
+  return { payloadAddress, rollup };
+}
+
 /**
  * Gets all contracts available in \@aztec/noir-contracts.js.
  * @returns The contract names.
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
index a84b9c7eebca..737201ce0fa7 100644
--- a/yarn-project/end-to-end/package.json
+++ b/yarn-project/end-to-end/package.json
@@ -84,6 +84,7 @@
     "lodash.chunk": "^4.2.0",
     "lodash.compact": "^3.0.1",
     "lodash.every": "^4.6.0",
+    "lodash.omit": "^4.5.0",
     "memdown": "^6.1.1",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts
index 498a510cdc7e..d52264bc8c0e 100644
--- a/yarn-project/end-to-end/src/fixtures/utils.ts
+++ b/yarn-project/end-to-end/src/fixtures/utils.ts
@@ -74,18 +74,7 @@ import getPort from 'get-port';
 import { tmpdir } from 'os';
 import * as path from 'path';
 import { inspect } from 'util';
-import {
-  type Account,
-  type Chain,
-  type HDAccount,
-  type Hex,
-  type PrivateKeyAccount,
-  createPublicClient,
-  createWalletClient,
-  fallback,
-  getContract,
-  http,
-} from 'viem';
+import { type Chain, type HDAccount, type Hex, type PrivateKeyAccount, getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
@@ -209,7 +198,7 @@ export async function setupPXEService(
  * @returns Private eXecution Environment (PXE) client, viem wallets, contract addresses etc.
  */
 async function setupWithRemoteEnvironment(
-  account: Account,
+  account: HDAccount | PrivateKeyAccount,
   config: AztecNodeConfig,
   logger: Logger,
   numberOfAccounts: number,
@@ -225,15 +214,8 @@ async function setupWithRemoteEnvironment(
   logger.verbose(`Retrieving contract addresses from ${PXE_URL}`);
   const l1Contracts = (await pxeClient.getNodeInfo()).l1ContractAddresses;
 
-  const walletClient = createWalletClient({
-    account,
-    chain: foundry,
-    transport: fallback(config.l1RpcUrls.map(url => http(url))),
-  });
-  const publicClient = createPublicClient({
-    chain: foundry,
-    transport: fallback(config.l1RpcUrls.map(url => http(url))),
-  });
+  const { walletClient, publicClient } = createL1Clients(config.l1RpcUrls, account, foundry);
+
   const deployL1ContractsValues: DeployL1ContractsReturnType = {
     l1ContractAddresses: l1Contracts,
     walletClient,
@@ -597,21 +579,21 @@ export async function setup(
 
   return {
     aztecNode,
-    proverNode,
-    pxe,
-    deployL1ContractsValues,
+    blobSink,
+    cheatCodes,
     config,
+    dateProvider,
+    deployL1ContractsValues,
     initialFundedAccounts,
-    wallet: wallets[0],
-    wallets,
     logger,
-    cheatCodes,
+    proverNode,
+    pxe,
     sequencer,
-    watcher,
-    dateProvider,
-    blobSink,
-    telemetryClient: telemetry,
     teardown,
+    telemetryClient: telemetry,
+    wallet: wallets[0],
+    wallets,
+    watcher,
   };
 }
 
diff --git a/yarn-project/end-to-end/src/spartan/upgrade_rollup_version.test.ts b/yarn-project/end-to-end/src/spartan/upgrade_rollup_version.test.ts
new file mode 100644
index 000000000000..97fa94a84116
--- /dev/null
+++ b/yarn-project/end-to-end/src/spartan/upgrade_rollup_version.test.ts
@@ -0,0 +1,311 @@
+import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { type NodeInfo, type PXE, createCompatibleClient, retryUntil, sleep } from '@aztec/aztec.js';
+import {
+  GovernanceProposerContract,
+  type L1ContractAddresses,
+  L1TxUtils,
+  RegistryContract,
+  RollupContract,
+  createEthereumChain,
+  createL1Clients,
+  defaultL1TxUtilsConfig,
+  deployRollupAndPeriphery,
+} from '@aztec/ethereum';
+import { createLogger } from '@aztec/foundation/log';
+import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
+import { TestERC20Abi as FeeJuiceAbi } from '@aztec/l1-artifacts/TestERC20Abi';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { getGenesisValues } from '@aztec/world-state/testing';
+
+import omit from 'lodash.omit';
+import { getContract } from 'viem';
+import { stringify } from 'viem/utils';
+
+import { isK8sConfig, rollAztecPods, setupEnvironment, startPortForward, updateSequencersConfig } from './utils.js';
+
+const config = setupEnvironment(process.env);
+if (!isK8sConfig(config)) {
+  throw new Error('This test must be run in a k8s environment');
+}
+
+const debugLogger = createLogger('e2e:spartan-test:upgrade_rollup_version');
+
+describe('spartan_upgrade_rollup_version', () => {
+  let pxe: PXE;
+  let nodeInfo: NodeInfo;
+  let ETHEREUM_HOSTS: string[];
+  let originalL1ContractAddresses: L1ContractAddresses;
+  beforeAll(async () => {
+    await startPortForward({
+      resource: `svc/${config.INSTANCE_NAME}-aztec-network-pxe`,
+      namespace: config.NAMESPACE,
+      containerPort: config.CONTAINER_PXE_PORT,
+      hostPort: config.HOST_PXE_PORT,
+    });
+    await startPortForward({
+      resource: `svc/${config.INSTANCE_NAME}-aztec-network-eth-execution`,
+      namespace: config.NAMESPACE,
+      containerPort: config.CONTAINER_ETHEREUM_PORT,
+      hostPort: config.HOST_ETHEREUM_PORT,
+    });
+    ETHEREUM_HOSTS = [`http://127.0.0.1:${config.HOST_ETHEREUM_PORT}`];
+
+    const PXE_URL = `http://127.0.0.1:${config.HOST_PXE_PORT}`;
+    pxe = await createCompatibleClient(PXE_URL, debugLogger);
+    nodeInfo = await pxe.getNodeInfo();
+    originalL1ContractAddresses = omit(nodeInfo.l1ContractAddresses, 'slashFactoryAddress');
+  });
+
+  // We need a separate account to deploy the new governance proposer
+  // because the underlying validators are currently producing blob transactions
+  // and you can't submit blob and non-blob transactions from the same account
+
+  it(
+    'should upgrade the rollup version',
+    async () => {
+      /** Helpers */
+      const govInfo = async () => {
+        const bn = await l1PublicClient.getBlockNumber();
+        const slot = await rollup.getSlotNumber();
+        const round = await governanceProposer.computeRound(slot);
+        const info = await governanceProposer.getRoundInfo(originalL1ContractAddresses.rollupAddress.toString(), round);
+        const leaderVotes = await governanceProposer.getProposalVotes(
+          originalL1ContractAddresses.rollupAddress.toString(),
+          round,
+          info.leader,
+        );
+        return { bn, slot, round, info, leaderVotes };
+      };
+
+      /** Setup */
+
+      const chain = createEthereumChain(ETHEREUM_HOSTS, nodeInfo.l1ChainId);
+      const { walletClient: l1WalletClient, publicClient: l1PublicClient } = createL1Clients(
+        ETHEREUM_HOSTS,
+        config.L1_ACCOUNT_MNEMONIC,
+        chain.chainInfo,
+        // TODO(#12301): magic number
+        2000,
+      );
+      debugLogger.info(`l1WalletClient: ${l1WalletClient.account.address}`);
+      const initialTestAccounts = await getInitialTestAccounts();
+
+      const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialTestAccounts.map(a => a.address));
+
+      const { rollup: newRollup, payloadAddress } = await deployRollupAndPeriphery(
+        {
+          walletClient: l1WalletClient,
+          publicClient: l1PublicClient,
+        },
+        {
+          // TODO(#12301): magic number
+          salt: 3,
+          vkTreeRoot: getVKTreeRoot(),
+          protocolContractTreeRoot,
+          l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
+          genesisArchiveRoot,
+          genesisBlockHash,
+          ethereumSlotDuration: 12,
+          aztecSlotDuration: 24,
+          aztecEpochDuration: 4,
+          aztecTargetCommitteeSize: 48,
+          aztecProofSubmissionWindow: 8,
+          minimumStake: BigInt(100e18),
+          slashingQuorum: 6,
+          slashingRoundSize: 10,
+          governanceProposerQuorum: 6,
+          governanceProposerRoundSize: 10,
+        },
+        originalL1ContractAddresses.registryAddress,
+        debugLogger,
+        defaultL1TxUtilsConfig,
+      );
+
+      await updateSequencersConfig(config, {
+        governanceProposerPayload: payloadAddress,
+      });
+
+      const rollup = new RollupContract(l1PublicClient, originalL1ContractAddresses.rollupAddress.toString());
+      const governanceProposer = new GovernanceProposerContract(
+        l1PublicClient,
+        originalL1ContractAddresses.governanceProposerAddress.toString(),
+      );
+
+      let info = await govInfo();
+      expect(info.bn).toBeDefined();
+      expect(info.slot).toBeDefined();
+      debugLogger.info(`info: ${stringify(info)}`);
+
+      const quorumSize = await governanceProposer.getQuorumSize();
+      debugLogger.info(`quorumSize: ${quorumSize}`);
+      expect(quorumSize).toBeGreaterThan(0);
+
+      /** GovernanceProposer Voting */
+
+      // Wait until we have enough votes to execute the proposal.
+      while (true) {
+        info = await govInfo();
+        debugLogger.info(`Leader votes: ${info.leaderVotes}`);
+        if (info.leaderVotes >= quorumSize) {
+          debugLogger.info(`Leader votes have reached quorum size`);
+          break;
+        }
+        await sleep(12000);
+      }
+
+      const executableRound = info.round;
+      debugLogger.info(`Waiting for round ${executableRound + 1n}`);
+
+      while (info.round === executableRound) {
+        await sleep(12500);
+        info = await govInfo();
+        debugLogger.info(`slot: ${info.slot}`);
+      }
+
+      expect(info.round).toBeGreaterThan(executableRound);
+
+      debugLogger.info(`Executing proposal ${info.round}`);
+
+      const l1TxUtils = new L1TxUtils(l1PublicClient, l1WalletClient, debugLogger);
+      const { receipt } = await governanceProposer.executeProposal(executableRound, l1TxUtils);
+      expect(receipt).toBeDefined();
+      expect(receipt.status).toEqual('success');
+      debugLogger.info(`Executed proposal ${info.round}`);
+
+      const addresses = await RegistryContract.collectAddresses(
+        l1PublicClient,
+        originalL1ContractAddresses.registryAddress,
+        'canonical',
+      );
+
+      // Set up the primary voter
+      const token = getContract({
+        address: addresses.feeJuiceAddress.toString(),
+        abi: FeeJuiceAbi,
+        client: l1PublicClient,
+      });
+
+      const governance = getContract({
+        address: addresses.governanceAddress.toString(),
+        abi: GovernanceAbi,
+        client: l1PublicClient,
+      });
+
+      // TODO(#12301): magic number
+      const voteAmount = 10_000n * 10n ** 18n;
+
+      const mintTx = await token.write.mint([l1WalletClient.account.address, voteAmount], {
+        account: l1WalletClient.account,
+      });
+      await l1PublicClient.waitForTransactionReceipt({ hash: mintTx });
+
+      const approveTx = await token.write.approve([addresses.governanceAddress.toString(), voteAmount], {
+        account: l1WalletClient.account,
+      });
+      await l1PublicClient.waitForTransactionReceipt({ hash: approveTx });
+
+      const depositTx = await governance.write.deposit([l1WalletClient.account.address, voteAmount], {
+        account: l1WalletClient.account,
+      });
+      await l1PublicClient.waitForTransactionReceipt({ hash: depositTx });
+
+      // Wait for the proposal to be in the voting phase
+      let proposalState = await governance.read.getProposalState([0n]);
+      expect(proposalState).toBeLessThan(2);
+      debugLogger.info(`Got proposal state`, proposalState);
+      while (proposalState !== 1) {
+        await sleep(5000);
+        debugLogger.info(`Waiting for proposal to be in the voting phase`);
+        proposalState = await governance.read.getProposalState([0n]);
+      }
+      debugLogger.info(`Proposal is in the voting phase`);
+      // Vote for the proposal
+      const voteTx = await governance.write.vote([0n, voteAmount, true], {
+        account: l1WalletClient.account,
+      });
+      await l1PublicClient.waitForTransactionReceipt({ hash: voteTx });
+      debugLogger.info(`Voted for the proposal`);
+
+      // Wait for the proposal to be in the executable phase
+      proposalState = await governance.read.getProposalState([0n]);
+      while (proposalState !== 3) {
+        await sleep(5000);
+        debugLogger.info(`Waiting for proposal to be in the executable phase`);
+        proposalState = await governance.read.getProposalState([0n]);
+      }
+      debugLogger.info(`Proposal is in the executable phase`);
+
+      // Execute the proposal
+      const executeTx = await governance.write.execute([0n], {
+        account: l1WalletClient.account,
+      });
+      await l1PublicClient.waitForTransactionReceipt({ hash: executeTx });
+      debugLogger.info(`Executed the proposal`);
+
+      const newAddresses = await newRollup.getRollupAddresses();
+
+      const newCanonicalAddresses = await RegistryContract.collectAddresses(
+        l1PublicClient,
+        originalL1ContractAddresses.registryAddress,
+        'canonical',
+      );
+
+      expect(newCanonicalAddresses).toEqual({
+        // we preserve the original registry/governance addresses
+        ...originalL1ContractAddresses,
+        // but have new instance addresses
+        ...newAddresses,
+      });
+
+      await expect(
+        RegistryContract.collectAddresses(l1PublicClient, originalL1ContractAddresses.registryAddress, 2),
+      ).resolves.toEqual(newCanonicalAddresses);
+
+      await expect(
+        RegistryContract.collectAddresses(l1PublicClient, originalL1ContractAddresses.registryAddress, 1),
+      ).resolves.toEqual(originalL1ContractAddresses);
+
+      const oldRollupTips = await rollup.getTips();
+      await retryUntil(
+        async () => {
+          const tips = await rollup.getTips();
+          return tips.provenBlockNumber > oldRollupTips.provenBlockNumber;
+        },
+        'old rollup should be building blocks',
+        // +5 just as a buffer
+        (config.AZTEC_PROOF_SUBMISSION_WINDOW + 5) * config.AZTEC_SLOT_DURATION,
+        5,
+      );
+
+      // Now delete all the pods, forcing them to restart on the new rollup
+      await rollAztecPods(config.NAMESPACE);
+
+      // restart the port forward
+      await startPortForward({
+        resource: `svc/${config.INSTANCE_NAME}-aztec-network-pxe`,
+        namespace: config.NAMESPACE,
+        containerPort: config.CONTAINER_PXE_PORT,
+        hostPort: config.HOST_PXE_PORT,
+      });
+
+      const newNodeInfo = await pxe.getNodeInfo();
+      expect(newNodeInfo.l1ContractAddresses.rollupAddress).toEqual(newCanonicalAddresses.rollupAddress);
+
+      const l2Tips = await newRollup.getTips();
+      await expect(
+        retryUntil(
+          async () => {
+            const tips = await newRollup.getTips();
+            return tips.provenBlockNumber > l2Tips.provenBlockNumber;
+          },
+          'new rollup should be building/proving blocks',
+          // +5 just as a buffer
+          (config.AZTEC_PROOF_SUBMISSION_WINDOW + 5) * config.AZTEC_SLOT_DURATION,
+          5,
+        ),
+      ).resolves.toBe(true);
+    },
+    6 * config.AZTEC_PROOF_SUBMISSION_WINDOW * config.AZTEC_SLOT_DURATION * 1000,
+  );
+});
diff --git a/yarn-project/end-to-end/src/spartan/utils.ts b/yarn-project/end-to-end/src/spartan/utils.ts
index 59adb58800d1..403f2fe1aa20 100644
--- a/yarn-project/end-to-end/src/spartan/utils.ts
+++ b/yarn-project/end-to-end/src/spartan/utils.ts
@@ -28,6 +28,10 @@ const ethereumHostsSchema = z.string().refine(
 );
 
 const k8sLocalConfigSchema = z.object({
+  ETHEREUM_SLOT_DURATION: z.coerce.number().min(1, 'ETHEREUM_SLOT_DURATION env variable must be set'),
+  AZTEC_SLOT_DURATION: z.coerce.number().min(1, 'AZTEC_SLOT_DURATION env variable must be set'),
+  AZTEC_EPOCH_DURATION: z.coerce.number().min(1, 'AZTEC_EPOCH_DURATION env variable must be set'),
+  AZTEC_PROOF_SUBMISSION_WINDOW: z.coerce.number().min(1, 'AZTEC_PROOF_SUBMISSION_WINDOW env variable must be set'),
   INSTANCE_NAME: z.string().min(1, 'INSTANCE_NAME env variable must be set'),
   NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
   HOST_NODE_PORT: z.coerce.number().min(1, 'HOST_NODE_PORT env variable must be set'),
@@ -531,3 +535,26 @@ export async function updateSequencersConfig(env: EnvConfig, config: Partial<Seq
     await updateSequencerConfig(env.NODE_URL, config);
   }
 }
+
+/**
+ * Rolls the Aztec pods in the given namespace.
+ * @param namespace - The namespace to roll the Aztec pods in.
+ * @dev - IMPORTANT: This function DOES NOT delete the underlying PVCs.
+ *        This means that the pods will be restarted with the same persistent storage.
+ *        This is useful for testing, but you should be aware of the implications.
+ */
+export async function rollAztecPods(namespace: string) {
+  await deleteResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=boot-node' });
+  await deleteResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=prover-node' });
+  await deleteResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=prover-broker' });
+  await deleteResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=prover-agent' });
+  await deleteResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=validator' });
+  await deleteResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=pxe' });
+  await sleep(10 * 1000);
+  await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=boot-node' });
+  await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=prover-node' });
+  await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=prover-broker' });
+  await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=prover-agent' });
+  await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=validator' });
+  await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=pxe' });
+}
diff --git a/yarn-project/ethereum/src/chain.ts b/yarn-project/ethereum/src/chain.ts
index 1edae58ff7ae..8fd340265c9f 100644
--- a/yarn-project/ethereum/src/chain.ts
+++ b/yarn-project/ethereum/src/chain.ts
@@ -19,9 +19,9 @@ export interface EthereumChain {
 }
 
 /**
- * Helper function to create an instance of Aztec Chain from an rpc url and api key.
- * @param rpcUrls - List of RPC URLs of the chain or chain identifiers (e.g. 'testnet')
- * @param _chainId - An optional chain identifier (e.g. 'testnet')
+ * Helper function to create an instance of Aztec Chain from an rpc url and chain id.
+ * @param rpcUrls - The rpc url of the chain or a chain identifier (e.g. 'http://localhost:8545')
+ * @param chainId - The chain id of the chain or a chain identifier (e.g. 1337)
  */
 export function createEthereumChain(rpcUrls: string[], _chainId: number | string): EthereumChain {
   let chainId: number;
diff --git a/yarn-project/ethereum/src/contracts/fee_juice.ts b/yarn-project/ethereum/src/contracts/fee_juice.ts
new file mode 100644
index 000000000000..388adb66278b
--- /dev/null
+++ b/yarn-project/ethereum/src/contracts/fee_juice.ts
@@ -0,0 +1,43 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { TestERC20Abi as FeeJuiceAbi } from '@aztec/l1-artifacts';
+
+import { type GetContractReturnType, type Hex, getContract } from 'viem';
+
+import type { L1Clients } from '../types.js';
+
+export class FeeJuiceContract {
+  private readonly publicFeeJuice: GetContractReturnType<typeof FeeJuiceAbi, L1Clients['publicClient']>;
+  private readonly walletFeeJuice: GetContractReturnType<typeof FeeJuiceAbi, L1Clients['walletClient']> | undefined;
+
+  constructor(
+    address: Hex,
+    public readonly publicClient: L1Clients['publicClient'],
+    public readonly walletClient: L1Clients['walletClient'] | undefined,
+  ) {
+    this.publicFeeJuice = getContract({ address, abi: FeeJuiceAbi, client: publicClient });
+    this.walletFeeJuice = walletClient ? getContract({ address, abi: FeeJuiceAbi, client: walletClient }) : undefined;
+  }
+
+  public get address() {
+    return EthAddress.fromString(this.publicFeeJuice.address);
+  }
+
+  private assertWalletFeeJuice() {
+    if (!this.walletFeeJuice) {
+      throw new Error('Wallet client is required for this operation');
+    }
+    return this.walletFeeJuice;
+  }
+
+  public async mint(to: Hex, amount: bigint) {
+    const walletFeeJuice = this.assertWalletFeeJuice();
+    const tx = await walletFeeJuice.write.mint([to, amount]);
+    await this.publicClient.waitForTransactionReceipt({ hash: tx });
+  }
+
+  public async approve(spender: Hex, amount: bigint) {
+    const walletFeeJuice = this.assertWalletFeeJuice();
+    const tx = await walletFeeJuice.write.approve([spender, amount]);
+    await this.publicClient.waitForTransactionReceipt({ hash: tx });
+  }
+}
diff --git a/yarn-project/ethereum/src/contracts/governance.ts b/yarn-project/ethereum/src/contracts/governance.ts
index 16cf9742f058..2f4d3789aaf9 100644
--- a/yarn-project/ethereum/src/contracts/governance.ts
+++ b/yarn-project/ethereum/src/contracts/governance.ts
@@ -1,10 +1,19 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
+import type { Logger } from '@aztec/foundation/log';
+import { sleep } from '@aztec/foundation/sleep';
 import { GovernanceAbi } from '@aztec/l1-artifacts';
 
-import { type GetContractReturnType, type Hex, getContract } from 'viem';
+import {
+  type EncodeFunctionDataParameters,
+  type GetContractReturnType,
+  type Hex,
+  encodeFunctionData,
+  getContract,
+} from 'viem';
 
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { ViemPublicClient } from '../types.js';
+import { L1TxUtils } from '../l1_tx_utils.js';
+import type { ViemPublicClient, ViemWalletClient } from '../types.js';
 import { GovernanceProposerContract } from './governance_proposer.js';
 
 export type L1GovernanceContractAddresses = Pick<
@@ -12,20 +21,40 @@ export type L1GovernanceContractAddresses = Pick<
   'governanceAddress' | 'rollupAddress' | 'registryAddress' | 'governanceProposerAddress'
 >;
 
+// NOTE: Must be kept in sync with DataStructures.ProposalState in l1-contracts
+export enum ProposalState {
+  Pending,
+  Active,
+  Queued,
+  Executable,
+  Rejected,
+  Executed,
+  Dropped,
+  Expired,
+}
+
 export class GovernanceContract {
-  private readonly governance: GetContractReturnType<typeof GovernanceAbi, ViemPublicClient>;
+  private readonly publicGovernance: GetContractReturnType<typeof GovernanceAbi, ViemPublicClient>;
+  private readonly walletGovernance: GetContractReturnType<typeof GovernanceAbi, ViemWalletClient> | undefined;
 
-  constructor(public readonly client: ViemPublicClient, address: Hex) {
-    this.governance = getContract({ address, abi: GovernanceAbi, client });
+  constructor(
+    address: Hex,
+    public readonly publicClient: ViemPublicClient,
+    public readonly walletClient: ViemWalletClient | undefined,
+  ) {
+    this.publicGovernance = getContract({ address, abi: GovernanceAbi, client: publicClient });
+    this.walletGovernance = walletClient
+      ? getContract({ address, abi: GovernanceAbi, client: walletClient })
+      : undefined;
   }
 
   public get address() {
-    return EthAddress.fromString(this.governance.address);
+    return EthAddress.fromString(this.publicGovernance.address);
   }
 
   public async getProposer() {
-    const governanceProposerAddress = EthAddress.fromString(await this.governance.read.governanceProposer());
-    return new GovernanceProposerContract(this.client, governanceProposerAddress.toString());
+    const governanceProposerAddress = EthAddress.fromString(await this.publicGovernance.read.governanceProposer());
+    return new GovernanceProposerContract(this.publicClient, governanceProposerAddress.toString());
   }
 
   public async getGovernanceAddresses(): Promise<L1GovernanceContractAddresses> {
@@ -41,4 +70,216 @@ export class GovernanceContract {
       governanceProposerAddress: governanceProposer.address,
     };
   }
+
+  public getProposal(proposalId: bigint) {
+    return this.publicGovernance.read.getProposal([proposalId]);
+  }
+
+  public async getProposalState(proposalId: bigint): Promise<ProposalState> {
+    const state = await this.publicGovernance.read.getProposalState([proposalId]);
+    if (state < 0 || state > ProposalState.Expired) {
+      throw new Error(`Invalid proposal state: ${state}`);
+    }
+    return state as ProposalState;
+  }
+
+  private assertWalletGovernance(): NonNullable<typeof this.walletGovernance> {
+    if (!this.walletGovernance) {
+      throw new Error('Wallet client is required for this operation');
+    }
+    return this.walletGovernance;
+  }
+
+  public async deposit(onBehalfOf: Hex, amount: bigint) {
+    const walletGovernance = this.assertWalletGovernance();
+    const depositTx = await walletGovernance.write.deposit([onBehalfOf, amount]);
+    await this.publicClient.waitForTransactionReceipt({ hash: depositTx });
+  }
+
+  public async proposeWithLock({
+    payloadAddress,
+    withdrawAddress,
+  }: {
+    payloadAddress: Hex;
+    withdrawAddress: Hex;
+  }): Promise<number> {
+    const walletGovernance = this.assertWalletGovernance();
+    const proposeTx = await walletGovernance.write.proposeWithLock([payloadAddress, withdrawAddress]);
+    const receipt = await this.publicClient.waitForTransactionReceipt({ hash: proposeTx });
+    if (receipt.status !== 'success') {
+      throw new Error(`Proposal failed: ${receipt.status}`);
+    }
+
+    const proposalId = Number(receipt.logs[1].topics[1]);
+    return proposalId;
+  }
+
+  public async awaitProposalActive({ proposalId, logger }: { proposalId: bigint; logger: Logger }) {
+    const state = await this.getProposalState(proposalId);
+    if (state === ProposalState.Active) {
+      return;
+    } else if (state !== ProposalState.Pending) {
+      throw new Error(`Proposal ${proposalId} is in state [${state}]: it will never be active`);
+    } else {
+      const proposal = await this.getProposal(proposalId);
+      const startOfActive = proposal.creation + proposal.config.votingDelay;
+      const block = await this.publicClient.getBlock();
+      // Add 12 seconds to the time to make sure we don't vote too early
+      const secondsToActive = Number(startOfActive - block.timestamp) + 12;
+      const now = new Date();
+      logger.info(`
+        The time is ${now.toISOString()}.
+        The proposal will be active at ${new Date(Number(startOfActive) * 1000).toISOString()}.
+        Waiting ${secondsToActive} seconds for proposal to be active.
+        `);
+      await sleep(secondsToActive * 1000);
+    }
+  }
+
+  public async awaitProposalExecutable({ proposalId, logger }: { proposalId: bigint; logger: Logger }) {
+    const state = await this.getProposalState(proposalId);
+    if (state === ProposalState.Executable) {
+      return;
+    } else if (
+      ![ProposalState.Pending, ProposalState.Active, ProposalState.Queued, ProposalState.Executable].includes(state)
+    ) {
+      throw new Error(`Proposal ${proposalId} is in state [${state}]: it will never be executable`);
+    } else {
+      const proposal = await this.getProposal(proposalId);
+      const startOfExecutable =
+        proposal.creation +
+        proposal.config.votingDelay +
+        proposal.config.votingDuration +
+        proposal.config.executionDelay;
+      const block = await this.publicClient.getBlock();
+      const secondsToExecutable = Number(startOfExecutable - block.timestamp) + 12;
+      const now = new Date();
+      logger.info(`
+        The time is ${now.toISOString()}.
+        The proposal will be executable at ${new Date(Number(startOfExecutable) * 1000).toISOString()}.
+        Waiting ${secondsToExecutable} seconds for proposal to be executable.
+        `);
+      await sleep(secondsToExecutable * 1000);
+    }
+  }
+
+  public async getPower(): Promise<bigint> {
+    const walletGovernance = this.assertWalletGovernance();
+    const now = await this.publicClient.getBlock();
+    return walletGovernance.read.powerAt([this.walletClient!.account.address, now.timestamp]);
+  }
+
+  public async vote({
+    proposalId,
+    voteAmount,
+    inFavor,
+    retries = 10,
+    logger,
+  }: {
+    proposalId: bigint;
+    voteAmount: bigint | undefined;
+    inFavor: boolean;
+    retries: number;
+    logger: Logger;
+  }) {
+    const walletGovernance = this.assertWalletGovernance();
+    const l1TxUtils = new L1TxUtils(this.publicClient, this.walletClient!, logger);
+    const retryDelaySeconds = 12;
+
+    voteAmount = voteAmount ?? (await this.getPower());
+
+    let success = false;
+    for (let i = 0; i < retries; i++) {
+      try {
+        const voteFunctionData: EncodeFunctionDataParameters<typeof GovernanceAbi, 'vote'> = {
+          abi: GovernanceAbi,
+          functionName: 'vote',
+          args: [proposalId, voteAmount, inFavor],
+        };
+        const encodedVoteData = encodeFunctionData(voteFunctionData);
+
+        const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+          to: walletGovernance.address,
+          data: encodedVoteData,
+        });
+
+        if (receipt.status === 'success') {
+          success = true;
+          break;
+        } else {
+          const args = {
+            ...voteFunctionData,
+            address: walletGovernance.address,
+          };
+          const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedVoteData, args, undefined, []);
+          logger.error(`Error voting on proposal ${proposalId}: ${errorMsg}`);
+        }
+      } catch (error) {
+        logger.error(`Error voting on proposal ${proposalId}: ${error}`);
+      }
+
+      logger.info(`Retrying vote on proposal ${proposalId} in ${retryDelaySeconds} seconds`);
+      await sleep(retryDelaySeconds * 1000);
+    }
+    if (!success) {
+      throw new Error(`Failed to vote on proposal ${proposalId} after ${retries} retries`);
+    }
+    logger.info(`Voted [${inFavor ? 'yea' : 'nay'}] on proposal [${proposalId}]`);
+    const proposal = await this.getProposal(proposalId);
+    logger.info(`Proposal [${proposalId}] has state [${proposal.state}]`);
+    logger.info(`Proposal [${proposalId}] has summedBallot yea [${proposal.summedBallot.yea}]`);
+    logger.info(`Proposal [${proposalId}] has summedBallot nea [${proposal.summedBallot.nea}]`);
+  }
+
+  public async executeProposal({
+    proposalId,
+    retries = 10,
+    logger,
+  }: {
+    proposalId: bigint;
+    retries: number;
+    logger: Logger;
+  }) {
+    const walletGovernance = this.assertWalletGovernance();
+    const l1TxUtils = new L1TxUtils(this.publicClient, this.walletClient!, logger);
+    const retryDelaySeconds = 12;
+    let success = false;
+    for (let i = 0; i < retries; i++) {
+      try {
+        const executeFunctionData: EncodeFunctionDataParameters<typeof GovernanceAbi, 'execute'> = {
+          abi: GovernanceAbi,
+          functionName: 'execute',
+          args: [proposalId],
+        };
+        const encodedExecuteData = encodeFunctionData(executeFunctionData);
+
+        const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+          to: walletGovernance.address,
+          data: encodedExecuteData,
+        });
+
+        if (receipt.status === 'success') {
+          success = true;
+          break;
+        } else {
+          const args = {
+            ...executeFunctionData,
+            address: walletGovernance.address,
+          };
+          const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedExecuteData, args, undefined, []);
+          logger.error(`Error executing proposal ${proposalId}: ${errorMsg}`);
+        }
+      } catch (error) {
+        logger.error(`Error executing proposal ${proposalId}: ${error}`);
+      }
+
+      logger.info(`Retrying execute proposal ${proposalId} in ${retryDelaySeconds} seconds`);
+      await sleep(retryDelaySeconds * 1000);
+    }
+    if (!success) {
+      throw new Error(`Failed to execute proposal ${proposalId} after ${retries} retries`);
+    } else {
+      logger.info(`Executed proposal ${proposalId}`);
+    }
+  }
 }
diff --git a/yarn-project/ethereum/src/contracts/index.ts b/yarn-project/ethereum/src/contracts/index.ts
index 9745bced5745..0db47645c7cd 100644
--- a/yarn-project/ethereum/src/contracts/index.ts
+++ b/yarn-project/ethereum/src/contracts/index.ts
@@ -1,6 +1,8 @@
 export * from './empire_base.js';
+export * from './fee_juice.js';
 export * from './forwarder.js';
 export * from './governance.js';
 export * from './governance_proposer.js';
+export * from './registry.js';
 export * from './rollup.js';
 export * from './slashing_proposer.js';
diff --git a/yarn-project/ethereum/src/contracts/registry.test.ts b/yarn-project/ethereum/src/contracts/registry.test.ts
index c925e3b746d0..c14476efdae9 100644
--- a/yarn-project/ethereum/src/contracts/registry.test.ts
+++ b/yarn-project/ethereum/src/contracts/registry.test.ts
@@ -1,19 +1,17 @@
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import { TestERC20Abi as FeeJuiceAbi, GovernanceAbi } from '@aztec/l1-artifacts';
 
 import type { Anvil } from '@viem/anvil';
 import omit from 'lodash.omit';
-import { getContract } from 'viem';
 import { type PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
 import { DefaultL1ContractsConfig } from '../config.js';
 import { createL1Clients, deployL1Contracts, deployRollupAndPeriphery } from '../deploy_l1_contracts.js';
-import { EthCheatCodes } from '../eth_cheat_codes.js';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
 import { defaultL1TxUtilsConfig } from '../l1_tx_utils.js';
 import { startAnvil } from '../test/start_anvil.js';
+import { createGovernanceProposal, executeGovernanceProposal } from '../test/upgrade_utils.js';
 import type { L1Clients } from '../types.js';
 import { RegistryContract } from './registry.js';
 
@@ -80,8 +78,7 @@ describe('Registry', () => {
   });
 
   it('handles non-existent versions', async () => {
-    const address = await registry.getRollupAddress(2);
-    expect(address).toBeUndefined();
+    await expect(registry.getRollupAddress(2)).rejects.toThrow('Rollup address is undefined');
   });
 
   it('collects addresses', async () => {
@@ -109,9 +106,10 @@ describe('Registry', () => {
     const newVersionSalt = originalVersionSalt + 1;
 
     const { rollup: newRollup, payloadAddress } = await deployRollupAndPeriphery(
-      [rpcUrl],
-      foundry,
-      privateKey,
+      {
+        walletClient,
+        publicClient,
+      },
       {
         ...DefaultL1ContractsConfig,
         salt: newVersionSalt,
@@ -121,12 +119,7 @@ describe('Registry', () => {
         genesisArchiveRoot: Fr.random(),
         genesisBlockHash: Fr.random(),
       },
-      {
-        feeJuicePortalAddress: addresses.feeJuicePortalAddress,
-        rewardDistributorAddress: addresses.rewardDistributorAddress,
-        stakingAssetAddress: addresses.stakingAssetAddress,
-        registryAddress: deployedAddresses.registryAddress,
-      },
+      deployedAddresses.registryAddress,
       logger,
       defaultL1TxUtilsConfig,
     );
@@ -139,7 +132,16 @@ describe('Registry', () => {
       logger,
     );
 
-    await executeGovernanceProposal(0n, governance, voteAmount, privateKey, publicClient, walletClient, rpcUrl, logger);
+    await executeGovernanceProposal(
+      0n,
+      governance,
+      voteAmount,
+      privateKey,
+      publicClient,
+      walletClient,
+      [rpcUrl],
+      logger,
+    );
 
     const newAddresses = await newRollup.getRollupAddresses();
 
@@ -163,94 +165,3 @@ describe('Registry', () => {
     ).resolves.toEqual(deployedAddresses);
   });
 });
-
-async function executeGovernanceProposal(
-  proposalId: bigint,
-  governance: any,
-  voteAmount: bigint,
-  privateKey: PrivateKeyAccount,
-  publicClient: L1Clients['publicClient'],
-  walletClient: L1Clients['walletClient'],
-  rpcUrl: string,
-  logger: Logger,
-) {
-  const proposal = await governance.read.getProposal([proposalId]);
-
-  const waitL1Block = async () => {
-    await publicClient.waitForTransactionReceipt({
-      hash: await walletClient.sendTransaction({
-        to: privateKey.address,
-        value: 1n,
-        account: privateKey,
-      }),
-    });
-  };
-
-  const cheatCodes = new EthCheatCodes([rpcUrl], logger);
-
-  const timeToActive = proposal.creation + proposal.config.votingDelay;
-  logger.info(`Warping to ${timeToActive + 1n}`);
-  await cheatCodes.warp(Number(timeToActive + 1n));
-  logger.info(`Warped to ${timeToActive + 1n}`);
-  await waitL1Block();
-
-  logger.info(`Voting`);
-  const voteTx = await governance.write.vote([proposalId, voteAmount, true], { account: privateKey });
-  await publicClient.waitForTransactionReceipt({ hash: voteTx });
-  logger.info(`Voted`);
-
-  const timeToExecutable = timeToActive + proposal.config.votingDuration + proposal.config.executionDelay + 1n;
-  logger.info(`Warping to ${timeToExecutable}`);
-  await cheatCodes.warp(Number(timeToExecutable));
-  logger.info(`Warped to ${timeToExecutable}`);
-  await waitL1Block();
-
-  const executeTx = await governance.write.execute([proposalId], { account: privateKey });
-  await publicClient.waitForTransactionReceipt({ hash: executeTx });
-  logger.info(`Executed proposal`);
-}
-
-async function createGovernanceProposal(
-  payloadAddress: `0x${string}`,
-  addresses: L1ContractAddresses,
-  privateKey: PrivateKeyAccount,
-  publicClient: L1Clients['publicClient'],
-  logger: Logger,
-) {
-  const token = getContract({
-    address: addresses.feeJuiceAddress.toString(),
-    abi: FeeJuiceAbi,
-    client: publicClient,
-  });
-
-  const governance = getContract({
-    address: addresses.governanceAddress.toString(),
-    abi: GovernanceAbi,
-    client: publicClient,
-  });
-
-  const lockAmount = 10000n * 10n ** 18n;
-  const voteAmount = 10000n * 10n ** 18n;
-
-  const mintTx = await token.write.mint([privateKey.address, lockAmount + voteAmount], { account: privateKey });
-  await publicClient.waitForTransactionReceipt({ hash: mintTx });
-  logger.info(`Minted tokens`);
-
-  const approveTx = await token.write.approve([addresses.governanceAddress.toString(), lockAmount + voteAmount], {
-    account: privateKey,
-  });
-  await publicClient.waitForTransactionReceipt({ hash: approveTx });
-  logger.info(`Approved tokens`);
-
-  const depositTx = await governance.write.deposit([privateKey.address, lockAmount + voteAmount], {
-    account: privateKey,
-  });
-  await publicClient.waitForTransactionReceipt({ hash: depositTx });
-  logger.info(`Deposited tokens`);
-
-  await governance.write.proposeWithLock([payloadAddress, privateKey.address], {
-    account: privateKey,
-  });
-
-  return { governance, voteAmount };
-}
diff --git a/yarn-project/ethereum/src/contracts/registry.ts b/yarn-project/ethereum/src/contracts/registry.ts
index dd8383f263cf..1453cebcfd4c 100644
--- a/yarn-project/ethereum/src/contracts/registry.ts
+++ b/yarn-project/ethereum/src/contracts/registry.ts
@@ -12,7 +12,7 @@ import {
 } from 'viem';
 
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { L1Clients } from '../types.js';
+import type { L1Clients, ViemPublicClient } from '../types.js';
 import { GovernanceContract } from './governance.js';
 import { RollupContract } from './rollup.js';
 
@@ -31,9 +31,9 @@ export class RegistryContract {
   /**
    * Returns the address of the rollup for a given version.
    * @param version - The version of the rollup. 'canonical' can be used to get the canonical address (i.e. the latest version).
-   * @returns The address of the rollup. If the rollup is not set for this version, returns undefined.
+   * @returns The address of the rollup. If the rollup is not set for this version, throws an error.
    */
-  public async getRollupAddress(version: number | bigint | 'canonical'): Promise<EthAddress | undefined> {
+  public async getRollupAddress(version: number | bigint | 'canonical'): Promise<EthAddress> {
     if (version === 'canonical') {
       return this.getCanonicalAddress();
     }
@@ -44,24 +44,30 @@ export class RegistryContract {
 
     const snapshot = await this.registry.read.getSnapshot([version]);
     const address = EthAddress.fromString(snapshot.rollup);
-    return address.equals(EthAddress.ZERO) ? undefined : address;
+    if (address.equals(EthAddress.ZERO)) {
+      throw new Error('Rollup address is undefined');
+    }
+    return address;
   }
 
   /**
    * Returns the canonical address of the rollup.
-   * @returns The canonical address of the rollup. If the rollup is not set, returns undefined.
+   * @returns The canonical address of the rollup. If the rollup is not set, throws an error.
    */
-  public async getCanonicalAddress(): Promise<EthAddress | undefined> {
+  public async getCanonicalAddress(): Promise<EthAddress> {
     const snapshot = await this.registry.read.getCurrentSnapshot();
     const address = EthAddress.fromString(snapshot.rollup);
-    return address.equals(EthAddress.ZERO) ? undefined : address;
+    if (address.equals(EthAddress.ZERO)) {
+      throw new Error('Rollup address is undefined');
+    }
+    return address;
   }
 
   public async getGovernanceAddresses(): Promise<
     Pick<L1ContractAddresses, 'governanceProposerAddress' | 'governanceAddress'>
   > {
     const governanceAddress = await this.registry.read.getGovernance();
-    const governance = new GovernanceContract(this.client, governanceAddress);
+    const governance = new GovernanceContract(governanceAddress, this.client, undefined);
     const governanceProposer = await governance.getProposer();
     return {
       governanceAddress: governance.address,
@@ -70,7 +76,7 @@ export class RegistryContract {
   }
 
   public static async collectAddresses(
-    client: L1Clients['publicClient'],
+    client: ViemPublicClient,
     registryAddress: Hex | EthAddress,
     rollupVersion: number | bigint | 'canonical',
   ): Promise<L1ContractAddresses> {
diff --git a/yarn-project/ethereum/src/contracts/rollup.ts b/yarn-project/ethereum/src/contracts/rollup.ts
index 4dd66ee9b104..5532a69fc186 100644
--- a/yarn-project/ethereum/src/contracts/rollup.ts
+++ b/yarn-project/ethereum/src/contracts/rollup.ts
@@ -22,6 +22,7 @@ export type L1RollupContractAddresses = Pick<
   | 'feeJuiceAddress'
   | 'stakingAssetAddress'
   | 'rewardDistributorAddress'
+  | 'slashFactoryAddress'
 >;
 
 export class RollupContract {
diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts
index 062fc50a60d3..82591b4ce304 100644
--- a/yarn-project/ethereum/src/deploy_l1_contracts.ts
+++ b/yarn-project/ethereum/src/deploy_l1_contracts.ts
@@ -211,18 +211,20 @@ export interface DeployL1ContractsArgs extends L1ContractsConfig {
  * @param rpcUrls - List of RPC URLs to connect to L1.
  * @param mnemonicOrPrivateKeyOrHdAccount - Mnemonic or account for the wallet client.
  * @param chain - Optional chain spec (defaults to local foundry).
+ * @param addressIndex - Optional index of the address to use from the mnemonic.
  * @returns - A wallet and a public client.
  */
 export function createL1Clients(
   rpcUrls: string[],
   mnemonicOrPrivateKeyOrHdAccount: string | `0x${string}` | HDAccount | PrivateKeyAccount,
   chain: Chain = foundry,
+  addressIndex?: number,
 ): L1Clients {
   const hdAccount =
     typeof mnemonicOrPrivateKeyOrHdAccount === 'string'
       ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x')
         ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount as `0x${string}`)
-        : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount)
+        : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount, { addressIndex })
       : mnemonicOrPrivateKeyOrHdAccount;
 
   // From what I can see, this is the difference between the HDAccount and the PrivateKeyAccount
@@ -247,21 +249,17 @@ export function createL1Clients(
 }
 
 export const deployRollupAndPeriphery = async (
-  rpcUrls: string[],
-  chain: Chain,
-  account: HDAccount | PrivateKeyAccount,
+  clients: L1Clients,
   args: DeployL1ContractsArgs,
-  addresses: Pick<
-    L1ContractAddresses,
-    'registryAddress' | 'feeJuicePortalAddress' | 'rewardDistributorAddress' | 'stakingAssetAddress'
-  >,
+  registryAddress: EthAddress,
   logger: Logger,
   txUtilsConfig: L1TxUtilsConfig,
 ) => {
-  const { walletClient, publicClient } = createL1Clients(rpcUrls, account, chain);
-  const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger, txUtilsConfig);
+  const deployer = new L1Deployer(clients.walletClient, clients.publicClient, args.salt, logger, txUtilsConfig);
+
+  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
 
-  const rollup = await deployRollup(walletClient, publicClient, deployer, args, addresses, logger);
+  const rollup = await deployRollup(clients, deployer, args, addresses, logger);
   const payloadAddress = await deployUpgradePayload(deployer, {
     registryAddress: addresses.registryAddress,
     rollupAddress: EthAddress.fromString(rollup.address),
@@ -292,8 +290,7 @@ export const deployUpgradePayload = async (
 };
 
 export const deployRollup = async (
-  walletClient: L1Clients['walletClient'],
-  publicClient: L1Clients['publicClient'],
+  clients: L1Clients,
   deployer: L1Deployer,
   args: DeployL1ContractsArgs,
   addresses: Pick<L1ContractAddresses, 'feeJuicePortalAddress' | 'rewardDistributorAddress' | 'stakingAssetAddress'>,
@@ -317,7 +314,7 @@ export const deployRollup = async (
     args.protocolContractTreeRoot.toString(),
     args.genesisArchiveRoot.toString(),
     args.genesisBlockHash.toString(),
-    walletClient.account.address.toString(),
+    clients.walletClient.account.address.toString(),
     rollupConfigArgs,
   ];
 
@@ -330,7 +327,7 @@ export const deployRollup = async (
   const rollup = getContract({
     address: getAddress(rollupAddress.toString()),
     abi: l1Artifacts.rollup.contractAbi,
-    client: walletClient,
+    client: clients.walletClient,
   });
 
   const txHashes: Hex[] = [];
@@ -353,15 +350,15 @@ export const deployRollup = async (
       const stakingAsset = getContract({
         address: addresses.stakingAssetAddress.toString(),
         abi: l1Artifacts.stakingAsset.contractAbi,
-        client: walletClient,
+        client: clients.walletClient,
       });
       // Mint tokens, approve them, use cheat code to initialise validator set without setting up the epoch.
       const stakeNeeded = args.minimumStake * BigInt(newValidatorsAddresses.length);
       await Promise.all(
         [
-          await stakingAsset.write.mint([walletClient.account.address, stakeNeeded], {} as any),
+          await stakingAsset.write.mint([clients.walletClient.account.address, stakeNeeded], {} as any),
           await stakingAsset.write.approve([rollupAddress.toString(), stakeNeeded], {} as any),
-        ].map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })),
+        ].map(txHash => clients.publicClient.waitForTransactionReceipt({ hash: txHash })),
       );
 
       const validators = newValidatorsAddresses.map(v => ({
@@ -379,9 +376,9 @@ export const deployRollup = async (
     }
   }
 
-  await Promise.all(txHashes.map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })));
+  await Promise.all(txHashes.map(txHash => clients.publicClient.waitForTransactionReceipt({ hash: txHash })));
 
-  return new RollupContract(publicClient, rollupAddress);
+  return new RollupContract(clients.publicClient, rollupAddress);
 };
 
 /**
@@ -531,8 +528,10 @@ export const deployL1Contracts = async (
   );
 
   const rollup = await deployRollup(
-    walletClient,
-    publicClient,
+    {
+      walletClient,
+      publicClient,
+    },
     deployer,
     args,
     { feeJuicePortalAddress, rewardDistributorAddress, stakingAssetAddress },
diff --git a/yarn-project/ethereum/src/queries.ts b/yarn-project/ethereum/src/queries.ts
index a8676d57d3d2..f51e97a3f74e 100644
--- a/yarn-project/ethereum/src/queries.ts
+++ b/yarn-project/ethereum/src/queries.ts
@@ -3,32 +3,14 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { L1ContractsConfig } from './config.js';
 import { GovernanceContract } from './contracts/governance.js';
 import { RollupContract } from './contracts/rollup.js';
-import type { L1ContractAddresses } from './l1_contract_addresses.js';
 import type { ViemPublicClient } from './types.js';
 
-/** Given the Governance contract address, reads the addresses from all other contracts from L1. */
-export async function getL1ContractsAddresses(
-  publicClient: ViemPublicClient,
-  governanceAddress: EthAddress,
-): Promise<Omit<L1ContractAddresses, 'slashFactoryAddress' | 'coinIssuerAddress'>> {
-  const governance = new GovernanceContract(publicClient, governanceAddress.toString());
-  const governanceAddresses = await governance.getGovernanceAddresses();
-
-  const rollup = new RollupContract(publicClient, governanceAddresses.rollupAddress.toString());
-  const rollupAddresses = await rollup.getRollupAddresses();
-
-  return {
-    ...governanceAddresses,
-    ...rollupAddresses,
-  };
-}
-
 /** Reads the L1ContractsConfig from L1 contracts. */
 export async function getL1ContractsConfig(
   publicClient: ViemPublicClient,
   addresses: { governanceAddress: EthAddress; rollupAddress?: EthAddress },
 ): Promise<Omit<L1ContractsConfig, 'ethereumSlotDuration'> & { l1StartBlock: bigint; l1GenesisTime: bigint }> {
-  const governance = new GovernanceContract(publicClient, addresses.governanceAddress.toString());
+  const governance = new GovernanceContract(addresses.governanceAddress.toString(), publicClient, undefined);
   const governanceProposer = await governance.getProposer();
   const rollupAddress = addresses.rollupAddress ?? (await governance.getGovernanceAddresses()).rollupAddress;
   const rollup = new RollupContract(publicClient, rollupAddress.toString());
diff --git a/yarn-project/ethereum/src/test/index.ts b/yarn-project/ethereum/src/test/index.ts
index 13734d1e6da3..345924d3695c 100644
--- a/yarn-project/ethereum/src/test/index.ts
+++ b/yarn-project/ethereum/src/test/index.ts
@@ -2,3 +2,4 @@ export * from './delayed_tx_utils.js';
 export * from './eth_cheat_codes_with_state.js';
 export * from './start_anvil.js';
 export * from './tx_delayer.js';
+export * from './upgrade_utils.js';
diff --git a/yarn-project/ethereum/src/test/upgrade_utils.ts b/yarn-project/ethereum/src/test/upgrade_utils.ts
new file mode 100644
index 000000000000..652fd5bf00c4
--- /dev/null
+++ b/yarn-project/ethereum/src/test/upgrade_utils.ts
@@ -0,0 +1,100 @@
+import type { Logger } from '@aztec/foundation/log';
+import { TestERC20Abi as FeeJuiceAbi } from '@aztec/l1-artifacts';
+import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
+
+import { type GetContractReturnType, type PrivateKeyAccount, getContract } from 'viem';
+
+import { EthCheatCodes } from '../eth_cheat_codes.js';
+import type { L1ContractAddresses } from '../l1_contract_addresses.js';
+import type { L1Clients } from '../types.js';
+
+export async function executeGovernanceProposal(
+  proposalId: bigint,
+  governance: GetContractReturnType<typeof GovernanceAbi, L1Clients['publicClient']>,
+  voteAmount: bigint,
+  privateKey: PrivateKeyAccount,
+  publicClient: L1Clients['publicClient'],
+  walletClient: L1Clients['walletClient'],
+  rpcUrls: string[],
+  logger: Logger,
+) {
+  const proposal = await governance.read.getProposal([proposalId]);
+
+  const waitL1Block = async () => {
+    await publicClient.waitForTransactionReceipt({
+      hash: await walletClient.sendTransaction({
+        to: privateKey.address,
+        value: 1n,
+        account: privateKey,
+      }),
+    });
+  };
+
+  const cheatCodes = new EthCheatCodes(rpcUrls, logger);
+
+  const timeToActive = proposal.creation + proposal.config.votingDelay;
+  logger.info(`Warping to ${timeToActive + 1n}`);
+  await cheatCodes.warp(Number(timeToActive + 1n));
+  logger.info(`Warped to ${timeToActive + 1n}`);
+  await waitL1Block();
+
+  logger.info(`Voting`);
+  const voteTx = await governance.write.vote([proposalId, voteAmount, true], { account: privateKey });
+  await publicClient.waitForTransactionReceipt({ hash: voteTx });
+  logger.info(`Voted`);
+
+  const timeToExecutable = timeToActive + proposal.config.votingDuration + proposal.config.executionDelay + 1n;
+  logger.info(`Warping to ${timeToExecutable}`);
+  await cheatCodes.warp(Number(timeToExecutable));
+  logger.info(`Warped to ${timeToExecutable}`);
+  await waitL1Block();
+
+  const executeTx = await governance.write.execute([proposalId], { account: privateKey });
+  await publicClient.waitForTransactionReceipt({ hash: executeTx });
+  logger.info(`Executed proposal`);
+}
+
+export async function createGovernanceProposal(
+  payloadAddress: `0x${string}`,
+  addresses: L1ContractAddresses,
+  privateKey: PrivateKeyAccount,
+  publicClient: L1Clients['publicClient'],
+  logger: Logger,
+): Promise<{ governance: GetContractReturnType<typeof GovernanceAbi, L1Clients['publicClient']>; voteAmount: bigint }> {
+  const token = getContract({
+    address: addresses.feeJuiceAddress.toString(),
+    abi: FeeJuiceAbi,
+    client: publicClient,
+  });
+
+  const governance = getContract({
+    address: addresses.governanceAddress.toString(),
+    abi: GovernanceAbi,
+    client: publicClient,
+  });
+
+  const lockAmount = 10000n * 10n ** 18n;
+  const voteAmount = 10000n * 10n ** 18n;
+
+  const mintTx = await token.write.mint([privateKey.address, lockAmount + voteAmount], { account: privateKey });
+  await publicClient.waitForTransactionReceipt({ hash: mintTx });
+  logger.info(`Minted tokens`);
+
+  const approveTx = await token.write.approve([addresses.governanceAddress.toString(), lockAmount + voteAmount], {
+    account: privateKey,
+  });
+  await publicClient.waitForTransactionReceipt({ hash: approveTx });
+  logger.info(`Approved tokens`);
+
+  const depositTx = await governance.write.deposit([privateKey.address, lockAmount + voteAmount], {
+    account: privateKey,
+  });
+  await publicClient.waitForTransactionReceipt({ hash: depositTx });
+  logger.info(`Deposited tokens`);
+
+  await governance.write.proposeWithLock([payloadAddress, privateKey.address], {
+    account: privateKey,
+  });
+
+  return { governance, voteAmount };
+}
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index d4e90922e55b..1239cde2fac1 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -626,6 +626,7 @@ __metadata:
     lodash.chunk: "npm:^4.2.0"
     lodash.compact: "npm:^3.0.1"
     lodash.every: "npm:^4.6.0"
+    lodash.omit: "npm:^4.5.0"
     memdown: "npm:^6.1.1"
     process: "npm:^0.11.10"
     stream-browserify: "npm:^3.0.0"