diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml
index c4ed5e3a810..14347cddb15 100644
--- a/.github/workflows/devnet-deploys.yml
+++ b/.github/workflows/devnet-deploys.yml
@@ -19,14 +19,15 @@ env:
   TF_VAR_L1_CHAIN_ID: 677692
   TF_VAR_BOOTNODE_1_PRIVATE_KEY: ${{ secrets.BOOTNODE_1_PRIVATE_KEY }}
   TF_VAR_BOOTNODE_2_PRIVATE_KEY: ${{ secrets.BOOTNODE_2_PRIVATE_KEY }}
-  TF_VAR_SEQ_1_PUBLISHER_PRIVATE_KEY: ${{ secrets.SEQ_1_PUBLISHER_PRIVATE_KEY }}
-  TF_VAR_SEQ_2_PUBLISHER_PRIVATE_KEY: ${{ secrets.SEQ_2_PUBLISHER_PRIVATE_KEY }}
+  TF_VAR_SEQUENCER_PRIVATE_KEYS: '["${{ secrets.SEQ_1_PUBLISHER_PRIVATE_KEY }}"]'
+  TF_VAR_NODE_P2P_PRIVATE_KEYS: '[""]'
   TF_VAR_DEPLOY_TAG: devnet
+  TF_VAR_IMAGE_TAG: ${{ github.sha }}
   TF_VAR_API_KEY: ${{ secrets.FORK_API_KEY }}
   TF_VAR_FORK_MNEMONIC: ${{ secrets.FORK_MNEMONIC }}
   TF_VAR_INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
   TF_VAR_FAUCET_ACCOUNT_INDEX: 5
-  CONTRACT_S3_BUCKET: s3://aztec-${{ env.DEPLOY_TAG }}-deployments
+  CONTRACT_S3_BUCKET: s3://aztec-devnet-deployments
 
 jobs:
   setup:
@@ -47,11 +48,28 @@ jobs:
         with:
           concurrency_key: build-release-artifacts-${{ github.actor }}
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+      - name: Check if only workflow flows have changed
+        id: check_only_workflow_changes
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { execSync } = require('child_process');
+            const changedFiles = execSync('git diff --name-only ${{ github.event.before }} ${{ github.sha }}')
+              .toString()
+              .split('\n')
+              .filter(line => line);
+            const prefixesToIgnore = ['.github', 'iac'];
+            const suffixesToIgnore = ['.tf'];
+            return changedFiles.every(file => (
+              prefixesToIgnore.some(prefix => file.startsWith(prefix)) ||
+              suffixesToIgnore.some(suffix => file.endsWith(suffix))
+            ));
       - name: "Build & Push aztec images"
         timeout-minutes: 40
+        if: steps.check_only_workflow_changes.outputs.result == 'false'
         run: |
-          earthly-ci \
-          --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }}
+          earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }}
+          earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }}
 
       - name: Check if mainnet fork needs deployment
         id: check_fork_changes
@@ -166,6 +184,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: "${{ env.GIT_COMMIT }}"
+          fetch-depth: 0
 
       - uses: ./.github/ci-setup-action
 
@@ -182,6 +201,7 @@ jobs:
 
       - name: Deploy protocol contracts
         run: |
+          set -e
           docker pull aztecprotocol/aztec:${{ env.DEPLOY_TAG }}
           docker run aztecprotocol/aztec:${{ env.DEPLOY_TAG }} deploy-protocol-contracts \
             --rpc-url https://api.aztec.network/${{ env.DEPLOY_TAG }}/aztec-pxe/${{ secrets.FORK_API_KEY }} \
@@ -193,6 +213,7 @@ jobs:
 
       - name: Bootstrap devnet
         run: |
+          set -e
           docker run aztecprotocol/aztec:${{ env.DEPLOY_TAG }} bootstrap-devnet \
             --rpc-url https://api.aztec.network/${{ env.DEPLOY_TAG }}/aztec-pxe/${{ secrets.FORK_API_KEY }} \
             --l1-rpc-url https://${{ env.DEPLOY_TAG }}-mainnet-fork.aztec.network:8545/${{ secrets.FORK_API_KEY }} \
@@ -225,6 +246,7 @@ jobs:
 
       - name: Retrieve contract addresses
         run: |
+          set -e
           aws s3 cp ${{ env.CONTRACT_S3_BUCKET }}/l1_contract_addresses.json ./l1-contract_addresses.json
           aws s3 cp ${{ env.CONTRACT_S3_BUCKET }}/devnet-contracts.json ./devnet-contracts.json
 
@@ -232,7 +254,7 @@ jobs:
           echo "TF_VAR_DEV_COIN_CONTRACT_ADDRESS=$(jq -r '.devCoinL1' ./devnet-contracts.json)" >>$GITHUB_ENV
 
       - name: Deploy Faucet
-        working-directory: ./yarn-project/aztec/aztec-faucet
+        working-directory: ./yarn-project/aztec-faucet
         run: |
           terraform init -input=false -backend-config="key=${{ env.DEPLOY_TAG }}/aztec-faucet"
           terraform apply -input=false -auto-approve
diff --git a/.github/workflows/metrics-deploys.yml b/.github/workflows/metrics-deploys.yml
new file mode 100644
index 00000000000..c187f403597
--- /dev/null
+++ b/.github/workflows/metrics-deploys.yml
@@ -0,0 +1,127 @@
+name: Deploy metrics
+on:
+  push:
+    branches: [devnet]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  GIT_COMMIT: ${{ github.sha }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  # TF Vars
+  TF_VAR_DOCKERHUB_ACCOUNT: aztecprotocol
+  TF_VAR_GRAFANA_CLIENT_ID: ${{ secrets.GRAFANA_CLIENT_ID }}
+  TF_VAR_GRAFANA_CLIENT_SECRET: ${{ secrets.GRAFANA_CLIENT_SECRET }}
+  TF_VAR_IMAGE_TAG: ${{ github.sha }}
+
+jobs:
+  setup:
+    uses: ./.github/workflows/setup-runner.yml
+    with:
+      username: master
+      runner_type: builder-x86
+    secrets: inherit
+  build:
+    needs: setup
+    runs-on: ${{ github.actor }}-x86
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "${{ env.GIT_COMMIT }}"
+          fetch-depth: 0
+      - uses: ./.github/ci-setup-action
+        with:
+          concurrency_key: build-metrics-${{ github.actor }}
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+
+      - name: Check if metrics have changed
+        id: check_metrics_changes
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { execSync } = require('child_process');
+            const changedFiles = execSync('git diff --name-only ${{ github.event.before }} ${{ github.sha }}').toString().split('\n');
+            const fileChanged = changedFiles.some(file => file.startsWith('metrics'));
+            return fileChanged
+
+      - name: Build & push prometheus
+        working-directory: ./metrics/prometheus
+        if: steps.check_metrics_changes.outputs.result == 'true'
+        run: |
+          docker build -t aztecprotocol/aztec-prometheus .
+          docker tag aztecprotocol/aztec-prometheus aztecprotocol/aztec-prometheus:$GIT_COMMIT
+          docker push aztecprotocol/aztec-prometheus
+          docker push aztecprotocol/aztec-prometheus:$GIT_COMMIT
+
+      - name: Build & push grafana
+        working-directory: ./metrics/grafana
+        if: steps.check_metrics_changes.outputs.result == 'true'
+        run: |
+          docker build -t aztecprotocol/aztec-grafana .
+          docker tag aztecprotocol/aztec-grafana aztecprotocol/aztec-grafana:$GIT_COMMIT
+          docker push aztecprotocol/aztec-grafana
+          docker push aztecprotocol/aztec-grafana:$GIT_COMMIT
+
+      - name: Build & push open telemetry
+        working-directory: ./metrics/otel
+        if: steps.check_metrics_changes.outputs.result == 'true'
+        run: |
+          docker build -t aztecprotocol/aztec-otel .
+          docker tag aztecprotocol/aztec-otel aztecprotocol/aztec-otel:$GIT_COMMIT
+          docker push aztecprotocol/aztec-otel
+          docker push aztecprotocol/aztec-otel:$GIT_COMMIT
+
+  terraform_deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "${{ env.GIT_COMMIT }}"
+          fetch-depth: 0
+      - uses: ./.github/ci-setup-action
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: 1.7.5
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
+
+      - name: Check if metrics have changed
+        id: check_metrics_changes
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { execSync } = require('child_process');
+            const changedFiles = execSync('git diff --name-only ${{ github.event.before }} ${{ github.sha }}').toString().split('\n');
+            const fileChanged = changedFiles.some(file => file.startsWith('metrics'));
+            return fileChanged
+
+      - name: Deploy prometheus
+        working-directory: ./metrics/prometheus/terraform
+        if: steps.check_metrics_changes.outputs.result == 'true'
+        run: |
+          terraform init -input=false -backend-config="key=aztec-prometheus"
+          terraform apply -input=false -auto-approve
+
+      - name: Deploy grafana
+        working-directory: ./metrics/grafana/terraform
+        if: steps.check_metrics_changes.outputs.result == 'true'
+        run: |
+          terraform init -input=false -backend-config="key=aztec-grafana"
+          terraform apply -input=false -auto-approve
+
+      - name: Deploy open telemetry
+        working-directory: ./metrics/otel/terraform
+        if: steps.check_metrics_changes.outputs.result == 'true'
+        run: |
+          terraform init -input=false -backend-config="key=aztec-otel"
+          terraform apply -input=false -auto-approve
diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
index f27f313f245..e2e2878b012 100644
--- a/barretenberg/.gitrepo
+++ b/barretenberg/.gitrepo
@@ -4,9 +4,9 @@
 ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
 ;
 [subrepo]
-	remote = https://github.com/AztecProtocol/barretenberg
-	branch = master
-	commit = f5b9be0eb29d7d1a7f202cb075f892552ab151c5
-	parent = 840486e5ce6b41d6c873239de108b3731dd81101
-	method = merge
-	cmdver = 0.4.6
+remote = https://github.com/AztecProtocol/barretenberg
+branch = master
+commit = f5b9be0eb29d7d1a7f202cb075f892552ab151c5
+parent = 840486e5ce6b41d6c873239de108b3731dd81101
+method = merge
+cmdver = 0.4.6
diff --git a/metrics/grafana/Dockerfile b/metrics/grafana/Dockerfile
new file mode 100644
index 00000000000..22d366f9af1
--- /dev/null
+++ b/metrics/grafana/Dockerfile
@@ -0,0 +1,4 @@
+FROM grafana/grafana:9.3.2
+COPY grafana.ini /etc/grafana/grafana.ini
+USER root
+EXPOSE 80
\ No newline at end of file
diff --git a/metrics/grafana/grafana.ini b/metrics/grafana/grafana.ini
new file mode 100644
index 00000000000..13d068f145a
--- /dev/null
+++ b/metrics/grafana/grafana.ini
@@ -0,0 +1,847 @@
+##################### Grafana Configuration Example #####################
+#
+# Everything has defaults so you only need to uncomment things you want to
+# change
+
+# possible values : production, development
+;app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+;instance_name = ${HOSTNAME}
+
+#################################### Paths ####################################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+;data = /var/lib/grafana
+
+# Temporary files in `data` directory older than given duration will be removed
+;temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+;logs = /var/log/grafana
+
+# Directory where grafana will automatically scan and look for plugins
+;plugins = /var/lib/grafana/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+;provisioning = conf/provisioning
+
+#################################### Server ####################################
+[server]
+# Protocol (http, https, h2, socket)
+;protocol = http
+
+# The ip address to bind to, empty will bind to all interfaces
+;http_addr =
+
+# The http port  to use
+http_port = 80
+
+# The public facing domain name used to access grafana from a browser
+;domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+;enforce_domain = false
+
+# The full public facing url you use in browser, used for redirects and emails
+# If you use reverse proxy and sub path specify full url (with sub path)
+root_url = https://grafana.aztec.network/
+
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+;serve_from_sub_path = false
+
+# Log web requests
+;router_logging = false
+
+# the path relative working path
+;static_root_path = public
+
+# enable gzip
+;enable_gzip = false
+
+# https certs & key file
+;cert_file =
+;cert_key =
+
+# Unix socket path
+;socket =
+
+#################################### Database ####################################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url properties.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+;type = sqlite3
+;host = 127.0.0.1:3306
+;name = grafana
+;user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+;url =
+
+# For "postgres" only, either "disable", "require" or "verify-full"
+;ssl_mode = disable
+
+;ca_cert_path =
+;client_key_path =
+;client_cert_path =
+;server_cert_name =
+
+# For "sqlite3" only, path relative to data_path setting
+;path = grafana.db
+
+# Max idle conn setting default is 2
+;max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+;max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+;conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+;log_queries =
+
+# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
+;cache_mode = private
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+;type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# memcache: 127.0.0.1:11211
+;connstr =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+;logging = false
+
+# How long the data proxy waits before timing out, default is 30 seconds.
+# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+;timeout = 30
+
+# How many seconds the data proxy waits before sending a keepalive probe request.
+;keep_alive_seconds = 30
+
+# How many seconds the data proxy waits for a successful TLS Handshake before timing out.
+;tls_handshake_timeout_seconds = 10
+
+# How many seconds the data proxy will wait for a server's first response headers after
+# fully writing the request headers if the request has an "Expect: 100-continue"
+# header. A value of 0 will result in the body being sent immediately, without
+# waiting for the server to approve.
+;expect_continue_timeout_seconds = 1
+
+# The maximum number of idle connections that Grafana will keep alive.
+;max_idle_connections = 100
+
+# How many seconds the data proxy keeps an idle connection open before timing out.
+;idle_conn_timeout_seconds = 90
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+;send_user_header = false
+
+#################################### Analytics ####################################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+;reporting_enabled = true
+
+# Set to false to disable all checks to https://grafana.net
+# for new versions (grafana itself and plugins), check is used
+# in some UI views to notify that grafana or plugin update exists
+# This option does not cause any auto updates, nor send any information
+# only a GET request to http://grafana.com to get latest versions
+;check_for_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+;google_analytics_ua_id =
+
+# Google Tag Manager ID, only enabled if you specify an id here
+;google_tag_manager_id =
+
+#################################### Security ####################################
+[security]
+# disable creation of admin user on first start of grafana
+;disable_initial_admin_creation = false
+
+# default admin user, created on startup
+;admin_user = admin
+
+# default admin password, can be changed before first start of grafana,  or in profile settings
+;admin_password = admin
+
+# used for signing
+;secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# disable gravatar profile images
+;disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+;data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+;disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+;cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
+;cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+;allow_embedding = false
+
+# Set to true if you want to enable http strict transport security (HSTS) response header.
+# This is only sent when HTTPS is enabled in this configuration.
+# HSTS tells browsers that the site should only be accessed using HTTPS.
+;strict_transport_security = false
+
+# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
+;strict_transport_security_max_age_seconds = 86400
+
+# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
+;strict_transport_security_preload = false
+
+# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
+;strict_transport_security_subdomains = false
+
+# Set to true to enable the X-Content-Type-Options response header.
+# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
+# in the Content-Type headers should not be changed and be followed.
+;x_content_type_options = true
+
+# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
+# when they detect reflected cross-site scripting (XSS) attacks.
+;x_xss_protection = true
+
+#################################### Snapshots ###########################
+[snapshots]
+# snapshot sharing options
+;external_enabled = true
+;external_snapshot_url = https://snapshots-origin.raintank.io
+;external_snapshot_name = Publish to snapshot.raintank.io
+
+# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
+# creating and deleting snapshots.
+;public_mode = false
+
+# remove expired snapshot
+;snapshot_remove_expired = true
+
+#################################### Dashboards History ##################
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+;versions_to_keep = 20
+
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;min_refresh_interval = 5s
+
+# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
+;default_home_dashboard_path =
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+;allow_sign_up = true
+
+# Allow non admin users to create organizations
+;allow_org_create = true
+
+# Set to true to automatically assign new users to the default organization (id 1)
+;auto_assign_org = true
+
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+;auto_assign_org_id = 1
+
+# Default role new users will be automatically assigned (if disabled above is set to true)
+;auto_assign_org_role = Viewer
+
+# Require email validation before sign up completes
+;verify_email_enabled = false
+
+# Background text for the user field on the login page
+;login_hint = email or username
+;password_hint = password
+
+# Default UI theme ("dark" or "light")
+;default_theme = dark
+
+# External user management, these options affect the organization users view
+;external_manage_link_url =
+;external_manage_link_name =
+;external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+;viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+;editors_can_admin = false
+
+# The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
+;user_invite_max_lifetime_duration = 24h
+
+[auth]
+# Login cookie name
+;login_cookie_name = grafana_session
+
+# The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation.
+;login_maximum_inactive_lifetime_duration =
+
+# The maximum lifetime (duration) an authenticated user can be logged in since login time before being required to login. Default is 30 days (30d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;login_maximum_lifetime_duration =
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+;token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
+;disable_login_form = false
+
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
+;disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+;signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+;oauth_auto_login = false
+
+# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
+;oauth_state_cookie_max_age = 600
+
+# limit of api_key seconds to live before expiration
+;api_key_max_seconds_to_live = -1
+
+# Set to true to enable SigV4 authentication option for HTTP-based datasources.
+;sigv4_auth_enabled = false
+
+#################################### Anonymous Auth ######################
+[auth.anonymous]
+# enable anonymous access
+# enabled = true
+
+# specify organization name that should be used for unauthenticated users
+# org_name = Aztec
+
+# specify role for unauthenticated users
+# org_role = Admin
+
+# mask the Grafana version number for unauthenticated users
+;hide_version = false
+
+#################################### GitHub Auth ##########################
+[auth.github]
+enabled = true
+client_id = GRAFANA_CLIENT_ID
+client_secret = GRAFANA_CLIENT_SECRET
+scopes = user:email,read:org
+auth_url = https://github.com/login/oauth/authorize
+token_url = https://github.com/login/oauth/access_token
+api_url = https://api.github.com/user
+allow_sign_up = true
+allowed_organizations = AztecProtocol
+
+#################################### GitLab Auth #########################
+[auth.gitlab]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = api
+;auth_url = https://gitlab.com/oauth/authorize
+;token_url = https://gitlab.com/oauth/token
+;api_url = https://gitlab.com/api/v4
+;allowed_domains =
+;allowed_groups =
+
+#################################### Google Auth ##########################
+[auth.google]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+;auth_url = https://accounts.google.com/o/oauth2/auth
+;token_url = https://accounts.google.com/o/oauth2/token
+;api_url = https://www.googleapis.com/oauth2/v1/userinfo
+;allowed_domains =
+;hosted_domain =
+
+#################################### Grafana.com Auth ####################
+[auth.grafana_com]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email
+;allowed_organizations =
+
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+;name = Azure AD
+;enabled = false
+;allow_sign_up = true
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;allowed_domains =
+;allowed_groups =
+
+#################################### Okta OAuth #######################
+[auth.okta]
+;name = Okta
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = openid profile email groups
+;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
+;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
+;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+;allowed_domains =
+;allowed_groups =
+;role_attribute_path =
+
+#################################### Generic OAuth ##########################
+[auth.generic_oauth]
+;enabled = false
+;name = OAuth
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;email_attribute_name = email:primary
+;email_attribute_path =
+;login_attribute_path =
+;id_token_attribute_name =
+;auth_url = https://foo.bar/login/oauth/authorize
+;token_url = https://foo.bar/login/oauth/access_token
+;api_url = https://foo.bar/user
+;allowed_domains =
+;team_ids =
+;allowed_organizations =
+;role_attribute_path =
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =
+
+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+;sync_ttl = 60
+;whitelist = 192.168.1.1, 192.168.2.1
+;headers = Email:X-User-Email, Name:X-User-Name
+# Read the auth proxy docs for details on what the setting below enables
+;enable_login_token = false
+
+#################################### Auth LDAP ##########################
+[auth.ldap]
+;enabled = false
+;config_file = /etc/grafana/ldap.toml
+;allow_sign_up = true
+
+# LDAP backround sync (Enterprise only)
+# At 1 am every day
+;sync_cron = "0 0 1 * * *"
+;active_sync_enabled = true
+
+#################################### SMTP / Emailing ##########################
+[smtp]
+;enabled = false
+;host = localhost:25
+;user =
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+;cert_file =
+;key_file =
+;skip_verify = false
+;from_address = admin@grafana.localhost
+;from_name = Grafana
+# EHLO identity in SMTP dialog (defaults to instance_name)
+;ehlo_identity = dashboard.example.com
+# SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
+;startTLS_policy = NoStartTLS
+
+[emails]
+;welcome_email_on_sign_up = false
+;templates_pattern = emails/*.html
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and  file
+# Use space to separate multiple modes, e.g. "console file"
+;mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+;level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+;filters =
+
+# For "console" mode only
+[log.console]
+;level =
+
+# log line format, valid options are text, console and json
+;format = console
+
+# For "file" mode only
+[log.file]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# This enables automated log rotate(switch of following options), default is true
+;log_rotate = true
+
+# Max line number of single file, default is 1000000
+;max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+;max_size_shift = 28
+
+# Segment log daily, default is true
+;daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+;max_days = 7
+
+[log.syslog]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+;network =
+;address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+;facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+;tag =
+
+#################################### Usage Quotas ########################
+[quota]
+; enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+; org_user = 10
+
+# limit number of dashboards per Org.
+; org_dashboard = 100
+
+# limit number of data_sources per Org.
+; org_data_source = 10
+
+# limit number of api_keys per Org.
+; org_api_key = 10
+
+# limit number of orgs a user can create.
+; user_org = 10
+
+# Global limit of users.
+; global_user = -1
+
+# global limit of orgs.
+; global_org = -1
+
+# global limit of dashboards
+; global_dashboard = -1
+
+# global limit of api_keys
+; global_api_key = -1
+
+# global limit on number of logged in users.
+; global_session = -1
+
+#################################### Alerting ############################
+[alerting]
+# Disable alerting engine & UI features
+;enabled = true
+# Makes it possible to turn off alert rule execution but alerting UI is visible
+;execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+;error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+;nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+;concurrent_render_limit = 5
+
+
+# Default setting for alert calculation timeout. Default value is 30
+;evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+;notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+;max_attempts = 3
+
+# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
+;min_interval_seconds = 1
+
+# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_annotation_age =
+
+# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
+;max_annotations_to_keep =
+
+#################################### Annotations #########################
+
+[annotations.dashboard]
+# Dashboard annotations means that annotations are associated with the dashboard they are created on.
+
+# Configures how long dashboard annotations are stored. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_age =
+
+# Configures max number of dashboard annotations that Grafana stores. Default value is 0, which keeps all dashboard annotations.
+;max_annotations_to_keep =
+
+[annotations.api]
+# API annotations means that the annotations have been created using the API without any
+# association with a dashboard.
+
+# Configures how long Grafana stores API annotations. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_age =
+
+# Configures max number of API annotations that Grafana keeps. Default value is 0, which keeps all API annotations.
+;max_annotations_to_keep =
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+;enabled = true
+
+#################################### Internal Grafana Metrics ##########################
+# Metrics available at HTTP API Url /metrics
+[metrics]
+# Disable / Enable internal metrics
+;enabled           = true
+# Graphite Publish interval
+;interval_seconds  = 10
+# Disable total stats (stat_totals_*) metrics to be generated
+;disable_total_stats = false
+
+#If both are set, basic auth will be required for the metrics endpoint.
+; basic_auth_username =
+; basic_auth_password =
+
+# Metrics environment info adds dimensions to the `grafana_environment_info` metric, which
+# can expose more information about the Grafana instance.
+[metrics.environment_info]
+#exampleLabel1 = exampleValue1
+#exampleLabel2 = exampleValue2
+
+# Send internal metrics to Graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+;address =
+;prefix = prod.grafana.%(instance_name)s.
+
+#################################### Grafana.com integration  ##########################
+# Url used to import dashboards directly from Grafana.com
+[grafana_com]
+;url = https://grafana.com
+
+#################################### Distributed tracing ############
+[tracing.jaeger]
+# Enable by setting the address sending traces to jaeger (ex localhost:6831)
+;address = localhost:6831
+# Tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+;always_included_tag = tag1:value1
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+;sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+;sampler_param = 1
+# sampling_server_url is the URL of a sampling manager providing a sampling strategy.
+;sampling_server_url =
+# Whether or not to use Zipkin propagation (x-b3- HTTP headers).
+;zipkin_propagation = false
+# Setting this to true disables shared RPC spans.
+# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
+;disable_shared_zipkin_spans = false
+
+#################################### External image storage ##########################
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# you can choose between (s3, webdav, gcs, azure_blob, local)
+;provider =
+
+[external_image_storage.s3]
+;endpoint =
+;path_style_access =
+;bucket =
+;region =
+;path =
+;access_key =
+;secret_key =
+
+[external_image_storage.webdav]
+;url =
+;public_url =
+;username =
+;password =
+
+[external_image_storage.gcs]
+;key_file =
+;bucket =
+;path =
+
+[external_image_storage.azure_blob]
+;account_name =
+;account_key =
+;container_name =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+;server_url =
+# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+;callback_url =
+# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
+# which this setting can help protect against by only allowing a certain amount of concurrent requests.
+;concurrent_render_request_limit = 30
+
+[panels]
+# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
+;disable_sanitize_html = false
+
+[plugins]
+;enable_alpha = false
+;app_tls_skip_verify_insecure = false
+# Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
+;allow_loading_unsigned_plugins =
+;marketplace_url = https://grafana.com/grafana/plugins/
+
+#################################### Grafana Image Renderer Plugin ##########################
+[plugin.grafana-image-renderer]
+# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
+# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
+# timezone IDs. Fallbacks to TZ environment variable if not set.
+;rendering_timezone =
+
+# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
+# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
+;rendering_language =
+
+# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
+# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
+;rendering_viewport_device_scale_factor =
+
+# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
+# the security risk it's not recommended to ignore HTTPS errors.
+;rendering_ignore_https_errors =
+
+# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
+# only capture and log error messages. When enabled, debug messages are captured and logged as well.
+# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
+# [log].filter = rendering:debug.
+;rendering_verbose_logging =
+
+# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
+# Default is false. This can be useful to enable (true) when troubleshooting.
+;rendering_dumpio =
+
+# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
+# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
+;rendering_args =
+
+# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
+# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
+# compatible with the plugin.
+;rendering_chrome_bin =
+
+# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
+# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
+# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
+;rendering_mode =
+
+# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# and will cluster using browser instances.
+# Mode 'context' will cluster using incognito pages.
+;rendering_clustering_mode =
+# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
+;rendering_clustering_max_concurrency =
+
+# Limit the maximum viewport width, height and device scale factor that can be requested.
+;rendering_viewport_max_width =
+;rendering_viewport_max_height =
+;rendering_viewport_max_device_scale_factor =
+
+# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
+# a port not in use.
+;grpc_host =
+;grpc_port =
+
+[enterprise]
+# Path to a valid Grafana Enterprise license.jwt file
+;license_path =
+
+[feature_toggles]
+# enable features, separated by spaces
+;enable =
+
+[date_formats]
+# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
+
+# Default system date format used in time range picker and other places where full time is displayed
+;full_date = YYYY-MM-DD HH:mm:ss
+
+# Used by graph and other places where we only show small intervals
+;interval_second = HH:mm:ss
+;interval_minute = HH:mm
+;interval_hour = MM/DD HH:mm
+;interval_day = MM/DD
+;interval_month = YYYY-MM
+;interval_year = YYYY
+
+# Experimental feature
+;use_browser_locale = false
+
+# Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
+;default_timezone = browser
diff --git a/metrics/grafana/replace_secrets.sh b/metrics/grafana/replace_secrets.sh
new file mode 100755
index 00000000000..4d9a90cdd54
--- /dev/null
+++ b/metrics/grafana/replace_secrets.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -u
+
+CLIENT_ID=$1
+CLIENT_SECRET=$2
+
+ID_COMMAND="s/GRAFANA_CLIENT_ID/${CLIENT_ID}/g"
+SECRET_COMMAND="s/GRAFANA_CLIENT_SECRET/${CLIENT_SECRET}/g"
+
+sed -i $ID_COMMAND grafana.ini
+sed -i $SECRET_COMMAND grafana.ini
\ No newline at end of file
diff --git a/metrics/grafana/terraform/main.tf b/metrics/grafana/terraform/main.tf
new file mode 100644
index 00000000000..c2aba5fdbc2
--- /dev/null
+++ b/metrics/grafana/terraform/main.tf
@@ -0,0 +1,235 @@
+terraform {
+  backend "s3" {
+    bucket = "aztec-terraform"
+    region = "eu-west-2"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "3.74.2"
+    }
+  }
+}
+
+data "terraform_remote_state" "setup_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "setup/setup-iac"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "aztec2_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "aztec2/iac"
+    region = "eu-west-2"
+  }
+}
+
+provider "aws" {
+  profile = "default"
+  region  = "eu-west-2"
+}
+
+resource "aws_service_discovery_service" "aztec_grafana" {
+  name = "aztec-grafana"
+
+  health_check_custom_config {
+    failure_threshold = 1
+  }
+
+  dns_config {
+    namespace_id = data.terraform_remote_state.setup_iac.outputs.local_service_discovery_id
+
+    dns_records {
+      ttl  = 60
+      type = "A"
+    }
+
+    routing_policy = "MULTIVALUE"
+  }
+}
+
+# Configure an EFS filesystem.
+resource "aws_efs_file_system" "aztec_grafana_data_store" {
+  creation_token = "aztec-grafana-data-store"
+
+  tags = {
+    Name = "aztec-grafana-data-store"
+  }
+
+  lifecycle_policy {
+    transition_to_ia = "AFTER_14_DAYS"
+  }
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}
+
+resource "aws_efs_mount_target" "private_az1" {
+  file_system_id  = aws_efs_file_system.aztec_grafana_data_store.id
+  subnet_id       = data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id
+  security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+}
+
+resource "aws_efs_mount_target" "private_az2" {
+  file_system_id  = aws_efs_file_system.aztec_grafana_data_store.id
+  subnet_id       = data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
+  security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+}
+
+# Define task definition and service.
+resource "aws_ecs_task_definition" "aztec_grafana" {
+  family                   = "aztec-grafana"
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  cpu                      = "256"
+  memory                   = "512"
+  execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+
+  volume {
+    name = "aztec-grafana-efs-data-store"
+    efs_volume_configuration {
+      file_system_id = aws_efs_file_system.aztec_grafana_data_store.id
+    }
+  }
+
+  container_definitions = <<DEFINITIONS
+[
+  {
+    "name": "aztec-grafana",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-grafana:${var.IMAGE_TAG}",
+    "essential": true,
+    "memoryReservation": 256,
+    "portMappings": [
+      {
+        "containerPort": 80
+      }
+    ],
+    "environment": [
+      {
+        "name": "GF_AUTH_GITHUB_CLIENT_ID",
+        "value": "${var.GRAFANA_CLIENT_ID}"
+      },
+      {
+        "name": "GF_AUTH_GITHUB_CLIENT_SECRET",
+        "value": "${var.GRAFANA_CLIENT_SECRET}"
+      }
+    ],
+    "mountPoints": [
+      {
+        "containerPath": "/var/lib/grafana",
+        "sourceVolume": "aztec-grafana-efs-data-store"
+      }
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/aztec-grafana",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    }
+  }
+]
+DEFINITIONS
+}
+
+data "aws_ecs_task_definition" "aztec_grafana" {
+  task_definition = aws_ecs_task_definition.aztec_grafana.family
+}
+
+resource "aws_ecs_service" "aztec_grafana" {
+  name                               = "aztec-grafana"
+  cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
+  launch_type                        = "FARGATE"
+  desired_count                      = "1"
+  deployment_maximum_percent         = 100
+  deployment_minimum_healthy_percent = 0
+  platform_version                   = "1.4.0"
+
+  network_configuration {
+    subnets = [
+      data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id,
+      data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
+    ]
+    security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+  }
+
+  load_balancer {
+    target_group_arn = aws_alb_target_group.aztec_grafana.arn
+    container_name   = "aztec-grafana"
+    container_port   = 80
+  }
+
+  service_registries {
+    registry_arn = aws_service_discovery_service.aztec_grafana.arn
+  }
+
+  task_definition = "${aws_ecs_task_definition.aztec_grafana.family}:${max(aws_ecs_task_definition.aztec_grafana.revision, data.aws_ecs_task_definition.aztec_grafana.revision)}"
+}
+
+# Logs
+resource "aws_cloudwatch_log_group" "aztec_grafana_logs" {
+  name              = "/fargate/service/aztec-grafana"
+  retention_in_days = "14"
+}
+
+# Configure ALB to route grafana.aztec.network to grafana.
+resource "aws_alb_target_group" "aztec_grafana" {
+  name                 = "aztec-grafana"
+  port                 = "80"
+  protocol             = "HTTP"
+  target_type          = "ip"
+  vpc_id               = data.terraform_remote_state.setup_iac.outputs.vpc_id
+  deregistration_delay = 5
+
+  health_check {
+    path                = "/"
+    matcher             = "302"
+    interval            = 10
+    healthy_threshold   = 2
+    unhealthy_threshold = 5
+    timeout             = 3
+  }
+
+  tags = {
+    name = "aztec-grafana"
+  }
+}
+
+resource "aws_lb_listener_rule" "api" {
+  listener_arn = data.terraform_remote_state.aztec2_iac.outputs.alb_listener_arn
+  priority     = 301
+
+  action {
+    type             = "forward"
+    target_group_arn = aws_alb_target_group.aztec_grafana.arn
+  }
+
+  condition {
+    host_header {
+      values = ["grafana.aztec.network"]
+    }
+  }
+}
+
+data "aws_alb" "aztec2" {
+  arn = data.terraform_remote_state.aztec2_iac.outputs.alb_arn
+}
+
+# API grafana DNS entry.
+resource "aws_route53_record" "metrics" {
+  zone_id = data.terraform_remote_state.aztec2_iac.outputs.aws_route53_zone_id
+  name    = "grafana"
+  type    = "A"
+  alias {
+    name                   = data.aws_alb.aztec2.dns_name
+    zone_id                = data.aws_alb.aztec2.zone_id
+    evaluate_target_health = true
+  }
+}
diff --git a/metrics/grafana/terraform/variables.tf b/metrics/grafana/terraform/variables.tf
new file mode 100644
index 00000000000..6f9ec599eba
--- /dev/null
+++ b/metrics/grafana/terraform/variables.tf
@@ -0,0 +1,16 @@
+variable "DOCKERHUB_ACCOUNT" {
+  type = string
+}
+
+variable "GRAFANA_CLIENT_ID" {
+  type = string
+}
+
+variable "GRAFANA_CLIENT_SECRET" {
+  type = string
+}
+
+variable "IMAGE_TAG" {
+  type = string
+  default = "latest"
+}
diff --git a/metrics/otel/Dockerfile b/metrics/otel/Dockerfile
new file mode 100644
index 00000000000..bc84cdcbda7
--- /dev/null
+++ b/metrics/otel/Dockerfile
@@ -0,0 +1,3 @@
+FROM otel/opentelemetry-collector-contrib:0.105.0
+COPY otel.yml /etc/otelcol-contrib/config.yaml
+EXPOSE 4318 8888 8889
\ No newline at end of file
diff --git a/metrics/otel/otel.yml b/metrics/otel/otel.yml
new file mode 100644
index 00000000000..b9e70117034
--- /dev/null
+++ b/metrics/otel/otel.yml
@@ -0,0 +1,29 @@
+receivers:
+  otlp:
+    protocols:
+      http:
+        endpoint: 0.0.0.0:4318
+
+processors:
+  batch:
+
+exporters:
+  debug: # enable debug
+  prometheus:
+    endpoint: 0.0.0.0:8889
+    metric_expiration: 5m
+  # otlp/jaeger:
+  #   endpoint: "jaeger:4317"
+  #   tls:
+  #     insecure: true
+
+service:
+  pipelines:
+    # traces:
+    #   receivers: [otlp]
+    #   processors: [batch]
+    #   exporters: [otlp/jaeger]
+    metrics:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [prometheus, debug]
diff --git a/metrics/otel/terraform/main.tf b/metrics/otel/terraform/main.tf
new file mode 100644
index 00000000000..367c4701ad5
--- /dev/null
+++ b/metrics/otel/terraform/main.tf
@@ -0,0 +1,129 @@
+terraform {
+  backend "s3" {
+    bucket = "aztec-terraform"
+    region = "eu-west-2"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "3.74.2"
+    }
+  }
+}
+
+data "terraform_remote_state" "setup_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "setup/setup-iac"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "aztec2_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "aztec2/iac"
+    region = "eu-west-2"
+  }
+}
+
+provider "aws" {
+  profile = "default"
+  region  = "eu-west-2"
+}
+
+resource "aws_service_discovery_service" "aztec_otel" {
+  name = "aztec-otel"
+
+  health_check_custom_config {
+    failure_threshold = 1
+  }
+
+  dns_config {
+    namespace_id = data.terraform_remote_state.setup_iac.outputs.local_service_discovery_id
+
+    dns_records {
+      ttl  = 60
+      type = "A"
+    }
+
+    routing_policy = "MULTIVALUE"
+  }
+}
+
+# Define task definition and service.
+resource "aws_ecs_task_definition" "aztec_otel" {
+  family                   = "aztec-otel"
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  cpu                      = "2048"
+  memory                   = "4096"
+  execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
+
+  container_definitions = <<DEFINITIONS
+[
+  {
+    "name": "aztec-otel",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-otel:${var.IMAGE_TAG}",
+    "essential": true,
+    "memoryReservation": 256,
+    "portMappings": [
+      {
+        "containerPort": 8888
+      },
+      {
+        "containerPort": 8889
+      },
+      {
+        "containerPort": 4318
+      }
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/aztec-otel",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    }
+  }
+]
+DEFINITIONS
+}
+
+data "aws_ecs_task_definition" "aztec_otel" {
+  task_definition = aws_ecs_task_definition.aztec_otel.family
+}
+
+resource "aws_ecs_service" "aztec_otel" {
+  name                               = "aztec-otel"
+  cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
+  launch_type                        = "FARGATE"
+  desired_count                      = "1"
+  deployment_maximum_percent         = 100
+  deployment_minimum_healthy_percent = 0
+  platform_version                   = "1.4.0"
+
+  network_configuration {
+    subnets = [
+      data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id,
+      data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
+    ]
+    security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+  }
+
+  service_registries {
+    registry_arn = aws_service_discovery_service.aztec_otel.arn
+  }
+
+  task_definition = "${aws_ecs_task_definition.aztec_otel.family}:${max(aws_ecs_task_definition.aztec_otel.revision, data.aws_ecs_task_definition.aztec_otel.revision)}"
+}
+
+# Logs
+resource "aws_cloudwatch_log_group" "aztec_otel_logs" {
+  name              = "/fargate/service/aztec-otel"
+  retention_in_days = "14"
+}
diff --git a/metrics/otel/terraform/variables.tf b/metrics/otel/terraform/variables.tf
new file mode 100644
index 00000000000..a9ee786b1b0
--- /dev/null
+++ b/metrics/otel/terraform/variables.tf
@@ -0,0 +1,8 @@
+variable "DOCKERHUB_ACCOUNT" {
+  type = string
+}
+
+variable "IMAGE_TAG" {
+  type = string
+  default = "latest"
+}
diff --git a/metrics/prometheus/Dockerfile b/metrics/prometheus/Dockerfile
new file mode 100644
index 00000000000..3f08c8ae379
--- /dev/null
+++ b/metrics/prometheus/Dockerfile
@@ -0,0 +1,4 @@
+FROM prom/prometheus
+COPY ./prometheus.yml /etc/prometheus/prometheus.yml
+USER root
+CMD ["--config.file=/etc/prometheus/prometheus.yml", "--storage.tsdb.path=/prometheus", "--web.console.libraries=/usr/share/prometheus/console_libraries", "--web.console.templates=/usr/share/prometheus/consoles", "--storage.tsdb.retention.time=2y"]
\ No newline at end of file
diff --git a/metrics/prometheus/prometheus.yml b/metrics/prometheus/prometheus.yml
new file mode 100644
index 00000000000..5073effdc65
--- /dev/null
+++ b/metrics/prometheus/prometheus.yml
@@ -0,0 +1,15 @@
+global:
+  scrape_interval: 15s
+  scrape_timeout: 15s
+  evaluation_interval: 15s
+
+scrape_configs:
+  - job_name: "prometheus"
+    static_configs:
+      - targets: ["localhost:9090"]
+  - job_name: otel-collector
+    static_configs:
+      - targets: ["aztec-otel.local:8888"]
+  - job_name: aztec
+    static_configs:
+      - targets: ["aztec-otel.local:8889"]
diff --git a/metrics/prometheus/terraform/main.tf b/metrics/prometheus/terraform/main.tf
new file mode 100644
index 00000000000..c51bcce1437
--- /dev/null
+++ b/metrics/prometheus/terraform/main.tf
@@ -0,0 +1,184 @@
+terraform {
+  backend "s3" {
+    bucket = "aztec-terraform"
+    region = "eu-west-2"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "3.74.2"
+    }
+  }
+}
+
+data "terraform_remote_state" "setup_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "setup/setup-iac"
+    region = "eu-west-2"
+  }
+}
+
+data "terraform_remote_state" "aztec2_iac" {
+  backend = "s3"
+  config = {
+    bucket = "aztec-terraform"
+    key    = "aztec2/iac"
+    region = "eu-west-2"
+  }
+}
+
+provider "aws" {
+  profile = "default"
+  region  = "eu-west-2"
+}
+
+resource "aws_service_discovery_service" "aztec_prometheus" {
+  name = "aztec-prometheus"
+
+  health_check_custom_config {
+    failure_threshold = 1
+  }
+
+  dns_config {
+    namespace_id = data.terraform_remote_state.setup_iac.outputs.local_service_discovery_id
+
+    dns_records {
+      ttl  = 60
+      type = "A"
+    }
+
+    routing_policy = "MULTIVALUE"
+  }
+}
+
+# Configure an EFS filesystem.
+resource "aws_efs_file_system" "aztec_prometheus_data_store" {
+  creation_token = "aztec-prometheus-data-store"
+
+  tags = {
+    Name = "aztec-prometheus-data-store"
+  }
+
+  lifecycle_policy {
+    transition_to_ia = "AFTER_14_DAYS"
+  }
+}
+
+resource "aws_efs_mount_target" "private_az1" {
+  file_system_id  = aws_efs_file_system.aztec_prometheus_data_store.id
+  subnet_id       = data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id
+  security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+}
+
+resource "aws_efs_mount_target" "private_az2" {
+  file_system_id  = aws_efs_file_system.aztec_prometheus_data_store.id
+  subnet_id       = data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
+  security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+}
+
+# Create role with EC2 read only access.
+# data "aws_iam_policy_document" "ecs_task" {
+#   statement {
+#     effect  = "Allow"
+#     actions = ["sts:AssumeRole"]
+
+#     principals {
+#       type        = "Service"
+#       identifiers = ["ecs-tasks.amazonaws.com"]
+#     }
+#   }
+# }
+
+# resource "aws_iam_role" "prometheus_task_role" {
+#   name               = "prometheus-task-role"
+#   assume_role_policy = data.aws_iam_policy_document.ecs_task.json
+# }
+
+# resource "aws_iam_role_policy_attachment" "ec2_read_only_attachment" {
+#   role       = aws_iam_role.prometheus_task_role.id
+#   policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess"
+# }
+
+# Define task definition and service.
+resource "aws_ecs_task_definition" "aztec_prometheus" {
+  family                   = "aztec-prometheus"
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  cpu                      = "2048"
+  memory                   = "4096"
+  execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
+
+  volume {
+    name = "aztec-prometheus-efs-data-store"
+    efs_volume_configuration {
+      file_system_id = aws_efs_file_system.aztec_prometheus_data_store.id
+    }
+  }
+
+  container_definitions = <<DEFINITIONS
+[
+  {
+    "name": "aztec-prometheus",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec-prometheus:${var.IMAGE_TAG}",
+    "essential": true,
+    "memoryReservation": 256,
+    "portMappings": [
+      {
+        "containerPort": 9090
+      }
+    ],
+    "mountPoints": [
+      {
+        "containerPath": "/prometheus",
+        "sourceVolume": "aztec-prometheus-efs-data-store"
+      }
+    ],
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/aztec-prometheus",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    }
+  }
+]
+DEFINITIONS
+}
+
+data "aws_ecs_task_definition" "aztec_prometheus" {
+  task_definition = aws_ecs_task_definition.aztec_prometheus.family
+}
+
+resource "aws_ecs_service" "aztec_prometheus" {
+  name                               = "aztec-prometheus"
+  cluster                            = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id
+  launch_type                        = "FARGATE"
+  desired_count                      = "1"
+  deployment_maximum_percent         = 100
+  deployment_minimum_healthy_percent = 0
+  platform_version                   = "1.4.0"
+
+  network_configuration {
+    subnets = [
+      data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id,
+      data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id
+    ]
+    security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id]
+  }
+
+  service_registries {
+    registry_arn = aws_service_discovery_service.aztec_prometheus.arn
+  }
+
+  task_definition = "${aws_ecs_task_definition.aztec_prometheus.family}:${max(aws_ecs_task_definition.aztec_prometheus.revision, data.aws_ecs_task_definition.aztec_prometheus.revision)}"
+}
+
+# Logs
+resource "aws_cloudwatch_log_group" "aztec_prometheus_logs" {
+  name              = "/fargate/service/aztec-prometheus"
+  retention_in_days = "14"
+}
diff --git a/metrics/prometheus/terraform/variables.tf b/metrics/prometheus/terraform/variables.tf
new file mode 100644
index 00000000000..747478ec61e
--- /dev/null
+++ b/metrics/prometheus/terraform/variables.tf
@@ -0,0 +1,8 @@
+variable "DOCKERHUB_ACCOUNT" {
+  type = string
+}
+
+variable "IMAGE_TAG" {
+  type    = string
+  default = "latest"
+}
diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
index 8e3c8689cb9..2e0d28805fe 100644
--- a/noir-projects/aztec-nr/.gitrepo
+++ b/noir-projects/aztec-nr/.gitrepo
@@ -4,9 +4,9 @@
 ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
 ;
 [subrepo]
-	remote = https://github.com/AztecProtocol/aztec-nr
-	branch = master
-	commit = c50e3c235e1014f74439c856584997296463638f
-	method = merge
-	cmdver = 0.4.6
-	parent = cb7d3a259df809f06d3aa0fd4400aa79d87930a1
+remote = https://github.com/AztecProtocol/aztec-nr
+branch = master
+commit = c50e3c235e1014f74439c856584997296463638f
+method = merge
+cmdver = 0.4.6
+parent = cb7d3a259df809f06d3aa0fd4400aa79d87930a1
diff --git a/yarn-project/aztec/terraform/node/main.tf b/yarn-project/aztec/terraform/node/main.tf
index 383871baadc..0c75330c9e2 100644
--- a/yarn-project/aztec/terraform/node/main.tf
+++ b/yarn-project/aztec/terraform/node/main.tf
@@ -54,9 +54,9 @@ data "terraform_remote_state" "l1_contracts" {
 
 # Compute local variables
 locals {
-  publisher_private_keys = [var.SEQ_1_PUBLISHER_PRIVATE_KEY, var.SEQ_2_PUBLISHER_PRIVATE_KEY]
-  node_p2p_private_keys  = [var.NODE_1_PRIVATE_KEY, var.NODE_2_PRIVATE_KEY]
-  node_count             = length(local.publisher_private_keys)
+  sequencer_private_keys = var.SEQUENCER_PRIVATE_KEYS
+  node_p2p_private_keys  = var.NODE_P2P_PRIVATE_KEYS
+  node_count             = length(local.sequencer_private_keys)
   data_dir               = "/usr/src/yarn-project/aztec"
 }
 
@@ -97,7 +97,7 @@ resource "aws_service_discovery_service" "aztec-node" {
   # Terraform just fails if this resource changes and you have registered instances.
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/servicediscovery-drain.sh ${self.id}"
+    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
   }
 }
 
@@ -162,7 +162,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
     },
     {
       name              = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
-      image             = "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}"
+      image             = "${var.DOCKERHUB_ACCOUNT}/aztec:${var.IMAGE_TAG}"
       command           = ["start", "--node", "--archiver", "--sequencer", "--prover"]
       essential         = true
       memoryReservation = 3776
@@ -226,7 +226,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
         },
         {
           name  = "SEQ_PUBLISHER_PRIVATE_KEY"
-          value = local.publisher_private_keys[count.index]
+          value = local.sequencer_private_keys[count.index]
         },
         {
           name  = "ROLLUP_CONTRACT_ADDRESS"
@@ -323,6 +323,14 @@ resource "aws_ecs_task_definition" "aztec-node" {
         {
           name  = "PROVER_REAL_PROOFS"
           value = tostring(var.PROVING_ENABLED)
+        },
+        {
+          name  = "TEL_COLLECTOR_BASE_URL"
+          value = "http://aztec-otel.local:4318"
+        },
+        {
+          name  = "TEL_SERVICE_NAME"
+          value = "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}"
         }
       ]
       mountPoints = [
diff --git a/yarn-project/aztec/terraform/node/variables.tf b/yarn-project/aztec/terraform/node/variables.tf
index 1efc9f94faf..9f644c89139 100644
--- a/yarn-project/aztec/terraform/node/variables.tf
+++ b/yarn-project/aztec/terraform/node/variables.tf
@@ -2,16 +2,20 @@ variable "DEPLOY_TAG" {
   type = string
 }
 
-variable "API_KEY" {
+variable "IMAGE_TAG" {
   type = string
 }
 
-variable "SEQ_1_PUBLISHER_PRIVATE_KEY" {
+variable "API_KEY" {
   type = string
 }
 
-variable "SEQ_2_PUBLISHER_PRIVATE_KEY" {
-  type = string
+variable "SEQUENCER_PRIVATE_KEYS" {
+  type = list(string)
+}
+
+variable "NODE_P2P_PRIVATE_KEYS" {
+  type = list(string)
 }
 
 variable "L1_CHAIN_ID" {
@@ -29,16 +33,6 @@ variable "NODE_P2P_UDP_PORT" {
   default = 40300
 }
 
-variable "NODE_1_PRIVATE_KEY" {
-  type    = string
-  default = ""
-}
-
-variable "NODE_2_PRIVATE_KEY" {
-  type    = string
-  default = ""
-}
-
 variable "DOCKERHUB_ACCOUNT" {
   type = string
 }
diff --git a/yarn-project/aztec/terraform/prover/main.tf b/yarn-project/aztec/terraform/prover/main.tf
index 1d131d93784..42f18016b56 100644
--- a/yarn-project/aztec/terraform/prover/main.tf
+++ b/yarn-project/aztec/terraform/prover/main.tf
@@ -85,7 +85,7 @@ resource "aws_service_discovery_service" "aztec-proving-agent" {
   # Terraform just fails if this resource changes and you have registered instances.
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/servicediscovery-drain.sh ${self.id}"
+    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
   }
 }
 
@@ -103,7 +103,7 @@ resource "aws_ecs_task_definition" "aztec-proving-agent" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-proving-agent-group-${count.index + 1}",
-    "image": "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}",
+    "image": "${var.DOCKERHUB_ACCOUNT}/aztec:${var.IMAGE_TAG}",
     "command": ["start", "--prover"],
     "essential": true,
     "memoryReservation": 98304,
diff --git a/yarn-project/aztec/terraform/prover/variables.tf b/yarn-project/aztec/terraform/prover/variables.tf
index 8dbad11e810..bdbea9c392f 100644
--- a/yarn-project/aztec/terraform/prover/variables.tf
+++ b/yarn-project/aztec/terraform/prover/variables.tf
@@ -2,6 +2,10 @@ variable "DEPLOY_TAG" {
   type = string
 }
 
+variable "IMAGE_TAG" {
+  type = string
+}
+
 variable "AGENTS_PER_SEQUENCER" {
   type    = string
   default = 1
diff --git a/yarn-project/aztec/terraform/pxe/main.tf b/yarn-project/aztec/terraform/pxe/main.tf
index a648a83a78d..50e44e1d832 100644
--- a/yarn-project/aztec/terraform/pxe/main.tf
+++ b/yarn-project/aztec/terraform/pxe/main.tf
@@ -65,7 +65,7 @@ resource "aws_service_discovery_service" "aztec-pxe" {
   # Terraform just fails if this resource changes and you have registered instances.
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/servicediscovery-drain.sh ${self.id}"
+    command = "${path.module}/../servicediscovery-drain.sh ${self.id}"
   }
 }
 
@@ -121,7 +121,7 @@ resource "aws_ecs_task_definition" "aztec-pxe" {
   container_definitions = jsonencode([
     {
       name      = "${var.DEPLOY_TAG}-aztec-pxe"
-      image     = "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}"
+      image     = "${var.DOCKERHUB_ACCOUNT}/aztec:${var.IMAGE_TAG}"
       command   = ["start", "--pxe"]
       essential = true
       portMappings = [
diff --git a/yarn-project/aztec/terraform/pxe/variables.tf b/yarn-project/aztec/terraform/pxe/variables.tf
index d7e7eaff50a..0b08ef7ebe7 100644
--- a/yarn-project/aztec/terraform/pxe/variables.tf
+++ b/yarn-project/aztec/terraform/pxe/variables.tf
@@ -2,6 +2,10 @@ variable "DEPLOY_TAG" {
   type = string
 }
 
+variable "IMAGE_TAG" {
+  type = string
+}
+
 variable "DOCKERHUB_ACCOUNT" {
   type = string
 }
diff --git a/yarn-project/aztec/terraform/node/servicediscovery-drain.sh b/yarn-project/aztec/terraform/servicediscovery-drain.sh
similarity index 100%
rename from yarn-project/aztec/terraform/node/servicediscovery-drain.sh
rename to yarn-project/aztec/terraform/servicediscovery-drain.sh
diff --git a/yarn-project/cli/src/cmds/devnet/bootstrap_devnet.ts b/yarn-project/cli/src/cmds/devnet/bootstrap_devnet.ts
index ccff7e4913a..d96b07d8b52 100644
--- a/yarn-project/cli/src/cmds/devnet/bootstrap_devnet.ts
+++ b/yarn-project/cli/src/cmds/devnet/bootstrap_devnet.ts
@@ -46,14 +46,20 @@ export async function bootstrapDevnet(
   const counterAddress = await deployCounter(wallet);
 
   if (json) {
-    log('', {
-      devCoinL1: erc20Address.toString(),
-      devCoinPortalL1: portalAddress.toString(),
-      devCoinL2: tokenAddress.toString(),
-      devCoinBridgeL2: bridgeAddress.toString(),
-      devCoinFpcL2: fpcAddress.toString(),
-      counterL2: counterAddress.toString(),
-    });
+    log(
+      JSON.stringify(
+        {
+          devCoinL1: erc20Address.toString(),
+          devCoinPortalL1: portalAddress.toString(),
+          devCoinL2: tokenAddress.toString(),
+          devCoinBridgeL2: bridgeAddress.toString(),
+          devCoinFpcL2: fpcAddress.toString(),
+          counterL2: counterAddress.toString(),
+        },
+        null,
+        2,
+      ),
+    );
   } else {
     log(`DevCoin L1: ${erc20Address}`);
     log(`DevCoin L1 Portal: ${portalAddress}`);
diff --git a/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts b/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
index 3ce149a20f3..91edbb6515c 100644
--- a/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
+++ b/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
@@ -31,11 +31,17 @@ export async function deployProtocolContracts(rpcUrl: string, l1ChainId: number,
   const feeJuiceAddress = await deployCanonicalL2GasToken(deployer, gasPortalAddress, waitOpts);
 
   if (json) {
-    log('', {
-      keyRegistryAddress: keyRegistryAddress.toString(),
-      authRegistryAddress: authRegistryAddress.toString(),
-      feeJuiceAddress: feeJuiceAddress.toString(),
-    });
+    log(
+      JSON.stringify(
+        {
+          keyRegistryAddress: keyRegistryAddress.toString(),
+          authRegistryAddress: authRegistryAddress.toString(),
+          feeJuiceAddress: feeJuiceAddress.toString(),
+        },
+        null,
+        2,
+      ),
+    );
   } else {
     log(`Key Registry: ${keyRegistryAddress}`);
     log(`Auth Registry: ${authRegistryAddress}`);
diff --git a/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts b/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts
index d30f114975b..3c12881c54e 100644
--- a/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts
+++ b/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts
@@ -14,7 +14,13 @@ export async function deployL1Contracts(
   const { l1ContractAddresses } = await deployAztecContracts(rpcUrl, chainId, privateKey, mnemonic, debugLogger);
 
   if (json) {
-    log('', l1ContractAddresses);
+    log(
+      JSON.stringify(
+        Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v]) => [k, v.toString()])),
+        null,
+        2,
+      ),
+    );
   } else {
     log(`Rollup Address: ${l1ContractAddresses.rollupAddress.toString()}`);
     log(`Registry Address: ${l1ContractAddresses.registryAddress.toString()}`);
diff --git a/yarn-project/prover-client/src/prover-agent/prover-agent.ts b/yarn-project/prover-client/src/prover-agent/prover-agent.ts
index 37e4f51e32d..a1d0fd7013c 100644
--- a/yarn-project/prover-client/src/prover-agent/prover-agent.ts
+++ b/yarn-project/prover-client/src/prover-agent/prover-agent.ts
@@ -62,10 +62,16 @@ export class ProverAgent {
             return;
           }
 
-          const promise = this.work(jobSource, job).finally(() => this.inFlightPromises.delete(job.id));
-          this.inFlightPromises.set(job.id, promise);
+          try {
+            const promise = this.work(jobSource, job).finally(() => this.inFlightPromises.delete(job.id));
+            this.inFlightPromises.set(job.id, promise);
+          } catch (err) {
+            this.log.warn(
+              `Error processing job! type=${ProvingRequestType[job.request.type]}: ${err}. ${(err as Error).stack}`,
+            );
+          }
         } catch (err) {
-          this.log.warn(`Error processing job: ${err}`);
+          // no-op
         }
       }
     }, this.pollIntervalMs);
diff --git a/yarn-project/telemetry-client/src/otel.ts b/yarn-project/telemetry-client/src/otel.ts
index 6ed1ce01218..6c2a7864c51 100644
--- a/yarn-project/telemetry-client/src/otel.ts
+++ b/yarn-project/telemetry-client/src/otel.ts
@@ -1,4 +1,7 @@
+import { type DebugLogger } from '@aztec/foundation/log';
+
 import { type Meter, type Tracer, type TracerProvider } from '@opentelemetry/api';
+import { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
 import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { HostMetrics } from '@opentelemetry/host-metrics';
@@ -15,6 +18,7 @@ export class OpenTelemetryClient implements TelemetryClient {
     private resource: Resource,
     private meterProvider: MeterProvider,
     private traceProvider: TracerProvider,
+    private log: DebugLogger,
   ) {}
 
   getMeter(name: string): Meter {
@@ -26,6 +30,9 @@ export class OpenTelemetryClient implements TelemetryClient {
   }
 
   public start() {
+    this.log.info('Starting OpenTelemetry client');
+    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
+
     this.hostMetrics = new HostMetrics({
       name: this.resource.attributes[SEMRESATTRS_SERVICE_NAME] as string,
       meterProvider: this.meterProvider,
@@ -38,7 +45,12 @@ export class OpenTelemetryClient implements TelemetryClient {
     await Promise.all([this.meterProvider.shutdown()]);
   }
 
-  public static createAndStart(name: string, version: string, collectorBaseUrl: URL): OpenTelemetryClient {
+  public static createAndStart(
+    name: string,
+    version: string,
+    collectorBaseUrl: URL,
+    log: DebugLogger,
+  ): OpenTelemetryClient {
     const resource = new Resource({
       [SEMRESATTRS_SERVICE_NAME]: name,
       [SEMRESATTRS_SERVICE_VERSION]: version,
@@ -63,7 +75,7 @@ export class OpenTelemetryClient implements TelemetryClient {
       ],
     });
 
-    const service = new OpenTelemetryClient(resource, meterProvider, tracerProvider);
+    const service = new OpenTelemetryClient(resource, meterProvider, tracerProvider, log);
     service.start();
 
     return service;
diff --git a/yarn-project/telemetry-client/src/start.ts b/yarn-project/telemetry-client/src/start.ts
index f83baa83400..e28c2ab9c5d 100644
--- a/yarn-project/telemetry-client/src/start.ts
+++ b/yarn-project/telemetry-client/src/start.ts
@@ -1,3 +1,5 @@
+import { createDebugLogger } from '@aztec/foundation/log';
+
 import { NoopTelemetryClient } from './noop.js';
 import { OpenTelemetryClient } from './otel.js';
 import { type TelemetryClient } from './telemetry.js';
@@ -9,9 +11,12 @@ export interface TelemetryClientConfig {
 }
 
 export function createAndStartTelemetryClient(config: TelemetryClientConfig): TelemetryClient {
+  const log = createDebugLogger('aztec:telemetry-client');
   if (config.collectorBaseUrl) {
-    return OpenTelemetryClient.createAndStart(config.serviceName, config.serviceVersion, config.collectorBaseUrl);
+    log.info('Using OpenTelemetry client');
+    return OpenTelemetryClient.createAndStart(config.serviceName, config.serviceVersion, config.collectorBaseUrl, log);
   } else {
+    log.info('Using NoopTelemetryClient');
     return new NoopTelemetryClient();
   }
 }