diff --git a/CI.md b/CI.md
index c6c05d1a9cec..290b16759f42 100644
--- a/CI.md
+++ b/CI.md
@@ -341,15 +341,11 @@ The release image is created from a bootstrap, by the `release-image/Dockerfile`
 
 ## Releases
 
-Releases can be performed directly from the terminal if necessary. However at present this will require `NPM_TOKEN` which is a secret restricted to a few people. In future we may provide a "staging organistion" for less secure unofficial releases.
+Release please is used and will automatically tag the commit e.g. `v1.2.3`. The project will subsequently be released under that version.
 
-One example might be to do an arbitrary commit release:
+You can also trigger pre and post releases using extended semver notation such as `v1.2.3-nightly.20250101` or `v1.2.3-devnet.0`. This are made simply by tagging the appropriate master commit.
 
-```
-./bootstrap.sh release_commit
-```
-
-Which will take the current working tree build, and release it under the current HEAD commit hash. Do this with caution as it's releasing your working tree, but it won't upgrade the official release. For example the npm packages will be published under the `next` distribution tag.
+Releases can be performed directly from the terminal if necessary. However at present this will require `NPM_TOKEN` which is a secret restricted to a few people. In future we may provide a "staging organization" for less secure unofficial releases.
 
 One can also side-step Release Please automation by updating the version number in the root `.release-please-manifest.json`, committing, tagging the repository with e.g. `v1.2.3`, checking out the tag, and running:
 
@@ -386,6 +382,7 @@ CI_FULL=1 ci ec2-test
 This will create a new instance, bootstrap, and run all tests that would run on master.
 
 ### How does swc compare to tsc (typescript compiler?)
+
 1. swc is stricter than tsc when it comes to hoisting ESM imports. This means that circular dependencies that were not causing issues previously may now do. madge seems like a good tool for spotting them (npx madge --circular path-to-file), since eslint no-circular-imports not always spots them. When dealing with circular deps, keep in mind type imports are removed, so you don't need to worry about those.
 2. swc is a lot faster than tsc, but it does not type check. When running bootstrap eg after a rebase, a successful run does not mean the project types are correct. You need to run bootstrap with TYPECHECK=1 for that. If you want to keep a running process that alerts you of type errors, do yarn tsc -b -w --emitDeclarationOnly at the root of yarn project.
 3. There is some combination of swc+tsc+jest that breaks things. If you happen to build your project with `tsc -b`, some test suites (such as prover-client or e2e) will fail to run with a parse error. Workaround is to re-build with swc before running tests by running `./bootstrap.sh compile` on yarn-project, and make sure you are not running `tsc -b -w` (or if you do, you set `--emitDeclarationOnly` as described above).
diff --git a/barretenberg/cpp/.rebuild_patterns b/barretenberg/cpp/.rebuild_patterns
index c6dd24549afc..4c7ba2459ea5 100644
--- a/barretenberg/cpp/.rebuild_patterns
+++ b/barretenberg/cpp/.rebuild_patterns
@@ -3,3 +3,4 @@
 ^barretenberg/cpp/.*Dockerfile.*$
 ^barretenberg/cpp/scripts/
 ^barretenberg/cpp/bootstrap.sh
+^barretenberg/cpp/CMakePresets.json
diff --git a/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh
index 5e01e28bc181..a4b06a337b9c 100755
--- a/barretenberg/cpp/bootstrap.sh
+++ b/barretenberg/cpp/bootstrap.sh
@@ -8,6 +8,24 @@ export preset=clang16-assert
 export pic_preset="clang16-pic"
 export hash=$(cache_content_hash .rebuild_patterns)
 
+# Injects version number into a given bb binary.
+# Means we don't actually need to rebuild bb to release a new version if code hasn't changed.
+function inject_version {
+  local binary=$1
+  local version=$(jq -r '."."' ../../.release-please-manifest.json)
+  local placeholder='00000000.00000000.00000000'
+  if [ ${#version} -gt ${#placeholder} ]; then
+    echo "Error: version ($version) is longer than placeholder. Cannot update bb binaries."
+    exit 1
+  fi
+  local offset=$(grep -aobF "$placeholder" $binary | head -n 1 | cut -d: -f1)
+  if [ -z "$offset" ]; then
+    echo "Placeholder not found in $binary, can't inject version."
+    exit 1
+  fi
+  printf "$version\0" | dd of=$binary bs=1 seek=$offset conv=notrunc 2>/dev/null
+}
+
 # Build all native binaries, including tests.
 function build_native {
   set -eu
@@ -98,46 +116,26 @@ function download_old_crs {
 }
 
 function build_release {
+  local arch=$(arch)
   rm -rf build-release
   mkdir build-release
-  local version=$(jq -r '."."' ../../.release-please-manifest.json)
-  local version_placeholder='00000000.00000000.00000000'
-  local version_regex='00000000\.00000000\.00000000'
-  local arch=$(arch)
-  # We pad version to the length of our version_placeholder, adding null bytes to the end.
-  # We then write out to this version to our artifacts, using sed to replace the version placeholder in our binaries.
-  # Calculate lengths (both version and placeholder)
-  local placeholder_length=${#version_placeholder}
-  local version_length=${#version}
-  if (( version_length > placeholder_length )); then
-    echo "Error: version ($version) is longer than placeholder ($version_placeholder). Cannot update bb binaries."
-    exit 1
-  fi
-  # Create a string for use in sed that will write the appropriate number of null bytes.
-  local N=$(( placeholder_length - version_length ))
-  local nullbytes="$(printf '\\x00%.0s' $(seq 1 "$N"))"
 
-  function update_bb_version {
-    local file=$1
-    if ! grep $version_regex "$file" 2>/dev/null; then
-      echo_stderr "Error: $file does not have placeholder ($version_placeholder). Cannot update bb binaries."
-      exit 1
-    fi
-    # Perform the actual replacement on a file.
-    sed "s/$version_regex/$version$nullbytes/" "$file"
-  }
-  update_bb_version build/bin/bb > build-release/bb
-  chmod +x build-release/bb
-  tar -czf build-release/barretenberg-$arch-linux.tar.gz -C build-release bb
-  # WASM binaries do not currently report version.
-  tar -czf build-release/barretenberg-wasm.tar.gz -C build-wasm/bin barretenberg.wasm
-  tar -czf build-release/barretenberg-debug-wasm.tar.gz -C build-wasm/bin barretenberg-debug.wasm
-  tar -czf build-release/barretenberg-threads-wasm.tar.gz -C build-wasm-threads/bin barretenberg.wasm
-  tar -czf build-release/barretenberg-threads-debug-wasm.tar.gz -C build-wasm-threads/bin barretenberg-debug.wasm
+  cp build/bin/bb build-release/bb
+  inject_version build-release/bb
+  tar -czf build-release/barretenberg-$arch-linux.tar.gz -C build-release --remove-files bb
+
   if [ "$CI_FULL" -eq 1 ]; then
-    update_bb_version build-darwin-$arch/bin/bb > build-darwin-$arch/bin/bb.replaced
-    chmod +x build-darwin-$arch/bin/bb.replaced
-    tar -czf build-release/barretenberg-$arch-darwin.tar.gz -C build-darwin-$arch/bin --transform 's/.replaced//' bb.replaced
+    cp build-darwin-$arch/bin/bb build-release/bb
+    inject_version build-release/bb
+    tar -czf build-release/barretenberg-$arch-darwin.tar.gz -C build-release --remove-files bb
+  fi
+
+  # Only release wasms built on amd64.
+  if [ "$arch" == "amd64 "]; then
+    tar -czf build-release/barretenberg-wasm.tar.gz -C build-wasm/bin barretenberg.wasm
+    tar -czf build-release/barretenberg-debug-wasm.tar.gz -C build-wasm/bin barretenberg-debug.wasm
+    tar -czf build-release/barretenberg-threads-wasm.tar.gz -C build-wasm-threads/bin barretenberg.wasm
+    tar -czf build-release/barretenberg-threads-debug-wasm.tar.gz -C build-wasm-threads/bin barretenberg-debug.wasm
   fi
 }
 
@@ -152,16 +150,12 @@ function build {
     build_wasm_threads
     download_old_crs
   )
-  if [ "$(arch)" == "amd64" ] && [ "${CI:-0}" = 1 ]; then
+  if [ "$(arch)" == "amd64" ] && [ "$CI" -eq 1 ]; then
     # TODO figure out why this is failing on arm64 with ultra circuit builder string op overflow.
-    builds+=(
-      build_gcc_syntax_check_only
-    )
+    builds+=(build_gcc_syntax_check_only)
   fi
   if [ "$CI_FULL" -eq 1 ]; then
-    builds+=(
-      build_darwin
-    )
+    builds+=(build_darwin)
   fi
   parallel --line-buffered --tag --halt now,fail=1 denoise {} ::: ${builds[@]}
   build_release
@@ -280,10 +274,6 @@ function release {
   do_or_dryrun gh release upload $REF_NAME build-release/* --clobber
 }
 
-function release_commit {
-  release
-}
-
 case "$cmd" in
   "clean")
     git clean -fdx
@@ -304,7 +294,7 @@ case "$cmd" in
   "hash")
     echo $hash
     ;;
-  test|test_cmds|bench|release|release_commit|build_native|build_wasm|build_wasm_threads|build_darwin|build_release)
+  test|test_cmds|bench|release|build_native|build_wasm|build_wasm_threads|build_darwin|build_release|inject_version)
     $cmd "$@"
     ;;
   *)
diff --git a/barretenberg/ts/bootstrap.sh b/barretenberg/ts/bootstrap.sh
index 58c3ad4838cd..ee3bdc50092c 100755
--- a/barretenberg/ts/bootstrap.sh
+++ b/barretenberg/ts/bootstrap.sh
@@ -41,13 +41,7 @@ function test {
 }
 
 function release {
-  local version=${REF_NAME#v}
-  deploy_npm $(dist_tag) $version
-}
-
-function release_commit {
-  local version="$CURRENT_VERSION-commit.$COMMIT_HASH"
-  deploy_npm next $version
+  deploy_npm $(dist_tag) ${REF_NAME#v}
 }
 
 case "$cmd" in
@@ -67,7 +61,7 @@ case "$cmd" in
   "bench")
     echo "ts/bootstrap.sh bench is empty"
     ;;
-  test|test_cmds|release|release_commit)
+  test|test_cmds|release)
     $cmd
     ;;
   *)
diff --git a/bootstrap.sh b/bootstrap.sh
index 56a8022409a3..99ddacf810e9 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -276,29 +276,6 @@ function release_dryrun {
   DRY_RUN=1 release
 }
 
-function release_commit {
-  export REF_NAME="commit-$COMMIT_HASH"
-
-  release_github
-
-  projects=(
-    barretenberg/cpp
-    barretenberg/ts
-    noir
-    l1-contracts
-    yarn-project
-    boxes
-    aztec-up
-    playground
-    docs
-    release-image
-  )
-
-  for project in "${projects[@]}"; do
-    $project/bootstrap.sh release_commit
-  done
-}
-
 case "$cmd" in
   "clean")
     echo "WARNING: This will erase *all* untracked files, including hooks and submodules."
@@ -338,7 +315,7 @@ case "$cmd" in
       release
     fi
     ;;
-  test|test_cmds|bench|release|release_dryrun|release_commit)
+  test|test_cmds|bench|release|release_dryrun)
     $cmd "$@"
     ;;
   *)
diff --git a/boxes/bootstrap.sh b/boxes/bootstrap.sh
index 69da2bda9221..bc2069bd90f2 100755
--- a/boxes/bootstrap.sh
+++ b/boxes/bootstrap.sh
@@ -102,11 +102,6 @@ function release {
   release_git_push $branch $REF_NAME ${REF_NAME#v}
 }
 
-function release_commit {
-  echo_header "boxes release commit"
-  release_git_push "$CURRENT_VERSION" "commit-$COMMIT_HASH" "$CURRENT_VERSION-commit.$COMMIT_HASH"
-}
-
 case "$cmd" in
   "clean")
     git clean -fdx
@@ -118,7 +113,7 @@ case "$cmd" in
   ""|"fast"|"full")
     build
     ;;
-  test|test_cmds|release|release_commit)
+  test|test_cmds|release)
     $cmd
     ;;
   "hash")
diff --git a/ci.sh b/ci.sh
index 6d8eb3787d55..07f7e40fb9ae 100755
--- a/ci.sh
+++ b/ci.sh
@@ -91,7 +91,7 @@ case "$cmd" in
     export DENOISE=1
     num=${1:-5}
     seq 0 $((num - 1)) | parallel --tag --line-buffered \
-      'INSTANCE_POSTFIX={} bootstrap_ec2 "USE_TEST_CACHE=0 ./bootstrap.sh ci" | cache_log "Grind {}"'
+      'INSTANCE_POSTFIX={} bootstrap_ec2 "USE_TEST_CACHE=0 ./bootstrap.sh ci" 2>&1 | cache_log "Grind {}"'
     ;;
   "local")
     # Create container with clone of local repo and bootstrap.
diff --git a/ci3/log_ci_run b/ci3/log_ci_run
index 62707235c3a1..dbaac5d188b5 100755
--- a/ci3/log_ci_run
+++ b/ci3/log_ci_run
@@ -13,6 +13,11 @@ if [ -z "$key" ]; then
   name=$REF_NAME
   [ "$(aws_get_meta_data instance-life-cycle)" == "spot" ] && spot=true || spot=false
 
+  # If this is github merge queue, just keep the queue name.
+  if [[ "$name" =~ ^gh-readonly-queue/([^/]+)/ ]]; then
+    name=${BASH_REMATCH[1]}
+  fi
+
   json=$(jq -c -j -n \
       --argjson timestamp "$key" \
       --arg status "$status" \
diff --git a/ci3/source_refname b/ci3/source_refname
index 7a86eef636e4..3893ddb1159e 100644
--- a/ci3/source_refname
+++ b/ci3/source_refname
@@ -25,14 +25,6 @@ if [ -z "${REF_NAME:-}" ]; then
     REF_NAME="${REF_NAME#heads/}"
   fi
 
-  # Strip off any leading "release/"
-  REF_NAME="${REF_NAME#release/}"
-
-  # If this is github merge queue, just keep the queue name.
-  if [[ "$REF_NAME" =~ ^gh-readonly-queue/([^/]+)/ ]]; then
-    REF_NAME=${BASH_REMATCH[1]}
-  fi
-
   [ -z "$REF_NAME" ] && exit 1
 
   export REF_NAME
diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh
index a6e1d2bb2d3f..4ff98a6a0391 100755
--- a/docs/bootstrap.sh
+++ b/docs/bootstrap.sh
@@ -83,10 +83,6 @@ function release {
   fi
 }
 
-function release_commit {
-  yarn netlify deploy --site aztec-docs-dev
-}
-
 case "$cmd" in
   "clean")
     git clean -fdx
diff --git a/l1-contracts/bootstrap.sh b/l1-contracts/bootstrap.sh
index 44384c8e8a13..5d4624c843d8 100755
--- a/l1-contracts/bootstrap.sh
+++ b/l1-contracts/bootstrap.sh
@@ -138,11 +138,6 @@ function release {
   release_git_push $branch $REF_NAME ${REF_NAME#v}
 }
 
-function release_commit {
-  echo_header "l1-contracts release commit"
-  release_git_push "$CURRENT_VERSION" "commit-$COMMIT_HASH" "$CURRENT_VERSION-commit.$COMMIT_HASH"
-}
-
 case "$cmd" in
   "clean")
     git clean -fdx
@@ -157,7 +152,7 @@ case "$cmd" in
   "test")
     test
     ;;
-  test_cmds|release|release_commit)
+  test_cmds|release)
     $cmd
     ;;
   "hash")
diff --git a/noir/bootstrap.sh b/noir/bootstrap.sh
index bc6d5b3e2106..692906c56f1a 100755
--- a/noir/bootstrap.sh
+++ b/noir/bootstrap.sh
@@ -71,6 +71,9 @@ function build_packages {
     mv packages/package packages/${project#*/}
   done
 
+  # Find all files in packages dir and use sed to in-place replace @noir-lang with @aztec/noir-
+  find packages -type f -exec sed -i 's|@noir-lang/|@aztec/noir-|g' {} \;
+
   cache_upload noir-packages-$hash.tar.gz \
     packages \
     noir-repo/acvm-repo/acvm_js/nodejs \
@@ -179,10 +182,6 @@ function release {
   release_packages $(dist_tag) ${REF_NAME#v}
 }
 
-function release_commit {
-  release_packages next "$CURRENT_VERSION-commit.$COMMIT_HASH"
-}
-
 case "$cmd" in
   "clean")
     git clean -fdx
@@ -194,7 +193,7 @@ case "$cmd" in
   ""|"fast"|"full")
     build
     ;;
-  test_cmds|build_native|build_packages|format|test|release|release_commit|test_example)
+  test_cmds|build_native|build_packages|format|test|release|test_example)
     $cmd "$@"
     ;;
   "hash")
diff --git a/release-image/bootstrap.sh b/release-image/bootstrap.sh
index 9ec4c56f86a9..5034e18d2dd5 100755
--- a/release-image/bootstrap.sh
+++ b/release-image/bootstrap.sh
@@ -56,10 +56,6 @@ case "$cmd" in
       docker manifest push aztecprotocol/aztec:$(dist_tag)
     fi
     ;;
-  "release_commit")
-    echo_header "release-image release commit"
-    docker push aztecprotocol/aztec:$(git rev-parse HEAD)
-    ;;
   *)
     echo "Unknown command: $cmd"
     exit 1
diff --git a/yarn-project/bb-prover/package.json b/yarn-project/bb-prover/package.json
index 9ee45cb2c03b..ed61e600519b 100644
--- a/yarn-project/bb-prover/package.json
+++ b/yarn-project/bb-prover/package.json
@@ -70,14 +70,14 @@
     "@aztec/bb.js": "portal:../../barretenberg/ts",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
+    "@aztec/noir-types": "portal:../../noir/packages/types",
     "@aztec/simulator": "workspace:^",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "@msgpack/msgpack": "^3.0.0-beta2",
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
-    "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^12.1.0",
     "pako": "^2.1.0",
     "source-map-support": "^0.5.21",
diff --git a/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts b/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts
index 23b04c89534c..806d76755a8b 100644
--- a/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts
+++ b/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts
@@ -1,12 +1,12 @@
 import { runInDirectory } from '@aztec/foundation/fs';
 import { type Logger, createLogger } from '@aztec/foundation/log';
+import { serializeWitness } from '@aztec/noir-noirc_abi';
 import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle';
+import type { WitnessMap } from '@aztec/noir-types';
 import type { SimulationProvider } from '@aztec/simulator/server';
 import type { ClientIvcProof } from '@aztec/stdlib/proofs';
 
 import { encode } from '@msgpack/msgpack';
-import { serializeWitness } from '@noir-lang/noirc_abi';
-import type { WitnessMap } from '@noir-lang/types';
 import { promises as fs } from 'fs';
 import path from 'path';
 
diff --git a/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts b/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts
index 5e016e9c63c6..b6acc329b487 100644
--- a/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts
+++ b/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts
@@ -15,6 +15,7 @@ import {
   updateResetCircuitSampleInputs,
 } from '@aztec/noir-protocol-circuits-types/client';
 import type { ArtifactProvider, ClientProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
+import type { Abi, WitnessMap } from '@aztec/noir-types';
 import type { SimulationProvider } from '@aztec/simulator/client';
 import type { PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
 import type {
@@ -30,8 +31,6 @@ import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 import type { ClientIvcProof } from '@aztec/stdlib/proofs';
 import type { CircuitSimulationStats, CircuitWitnessGenerationStats } from '@aztec/stdlib/stats';
 
-import type { Abi, WitnessMap } from '@noir-lang/types';
-
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 
 export abstract class BBPrivateKernelProver implements PrivateKernelProver {
diff --git a/yarn-project/bb-prover/src/prover/bb_prover.ts b/yarn-project/bb-prover/src/prover/bb_prover.ts
index 24d7e583e409..c2908063d376 100644
--- a/yarn-project/bb-prover/src/prover/bb_prover.ts
+++ b/yarn-project/bb-prover/src/prover/bb_prover.ts
@@ -38,6 +38,7 @@ import {
   convertSingleTxBlockRootRollupOutputsFromWitnessMap,
 } from '@aztec/noir-protocol-circuits-types/server';
 import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
+import type { WitnessMap } from '@aztec/noir-types';
 import { NativeACVMSimulator } from '@aztec/simulator/server';
 import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
 import { ProvingError } from '@aztec/stdlib/errors';
@@ -68,7 +69,6 @@ import type { CircuitProvingStats, CircuitWitnessGenerationStats } from '@aztec/
 import type { VerificationKeyData } from '@aztec/stdlib/vks';
 import { Attributes, type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 
-import type { WitnessMap } from '@noir-lang/types';
 import { assert } from 'console';
 import crypto from 'crypto';
 import { promises as fs } from 'fs';
diff --git a/yarn-project/bb-prover/src/test/test_circuit_prover.ts b/yarn-project/bb-prover/src/test/test_circuit_prover.ts
index 9b9873401b74..9601a9e533ea 100644
--- a/yarn-project/bb-prover/src/test/test_circuit_prover.ts
+++ b/yarn-project/bb-prover/src/test/test_circuit_prover.ts
@@ -34,6 +34,7 @@ import {
   convertSimulatedSingleTxBlockRootRollupOutputsFromWitnessMap,
 } from '@aztec/noir-protocol-circuits-types/server';
 import { ProtocolCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
+import type { WitnessMap } from '@aztec/noir-types';
 import { type SimulationProvider, WASMSimulatorWithBlobs, emitCircuitSimulationStats } from '@aztec/simulator/server';
 import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
 import {
@@ -62,8 +63,6 @@ import type {
 import { VerificationKeyData } from '@aztec/stdlib/vks';
 import { type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 
-import type { WitnessMap } from '@noir-lang/types';
-
 import { ProverInstrumentation } from '../instrumentation.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { PROOF_DELAY_MS, WITGEN_DELAY_MS } from './delay_values.js';
diff --git a/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts b/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts
index f42fe0d7802b..01906f424c4c 100644
--- a/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts
+++ b/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts
@@ -1,12 +1,12 @@
 import { AztecClientBackend } from '@aztec/bb.js';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import { serializeWitness } from '@aztec/noir-noirc_abi';
 import type { ArtifactProvider } from '@aztec/noir-protocol-circuits-types/types';
+import type { WitnessMap } from '@aztec/noir-types';
 import type { SimulationProvider } from '@aztec/simulator/client';
 import { ClientIvcProof } from '@aztec/stdlib/proofs';
 
-import { serializeWitness } from '@noir-lang/noirc_abi';
-import type { WitnessMap } from '@noir-lang/types';
 import { ungzip } from 'pako';
 
 import { BBPrivateKernelProver } from '../prover/bb_private_kernel_prover.js';
diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh
index 944c3b2a7da3..47acf0e9fb16 100755
--- a/yarn-project/bootstrap.sh
+++ b/yarn-project/bootstrap.sh
@@ -166,12 +166,7 @@ function release_packages {
 function release {
   echo_header "yarn-project release"
   # WORKTODO latest is only on master, otherwise use ref name
-  release_packages $(dist_tag) ${REF_NAME#v}
-}
-
-function release_commit {
-  echo_header "yarn-project release commit"
-  release_packages next "$CURRENT_VERSION-commit.$COMMIT_HASH"
+  release_packages $(dist-tag) ${REF_NAME#v}
 }
 
 case "$cmd" in
@@ -205,7 +200,7 @@ case "$cmd" in
   "lint")
     lint "$@"
     ;;
-  test|test_cmds|hash|release|release_commit|format)
+  test|test_cmds|hash|release|format)
     $cmd
     ;;
   *)
diff --git a/yarn-project/ivc-integration/package.json b/yarn-project/ivc-integration/package.json
index 56dd12575914..75ba52b3629f 100644
--- a/yarn-project/ivc-integration/package.json
+++ b/yarn-project/ivc-integration/package.json
@@ -63,11 +63,11 @@
     "@aztec/bb.js": "../../ts",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen",
+    "@aztec/noir-noir_js": "file:../../noir/packages/noir_js",
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
+    "@aztec/noir-types": "portal:../../noir/packages/types",
     "@aztec/stdlib": "workspace:^",
-    "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen",
-    "@noir-lang/noir_js": "file:../../noir/packages/noir_js",
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
-    "@noir-lang/types": "portal:../../noir/packages/types",
     "chalk": "^5.3.0",
     "change-case": "^5.4.4",
     "pako": "^2.1.0",
diff --git a/yarn-project/ivc-integration/src/index.ts b/yarn-project/ivc-integration/src/index.ts
index 732e9722fbf0..4f8bcc8d77f8 100644
--- a/yarn-project/ivc-integration/src/index.ts
+++ b/yarn-project/ivc-integration/src/index.ts
@@ -1,6 +1,6 @@
 import type { CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { type ForeignCallOutput, Noir } from '@aztec/noir-noir_js';
 
-import { type ForeignCallOutput, Noir } from '@noir-lang/noir_js';
 import createDebug from 'debug';
 import { ungzip } from 'pako';
 
diff --git a/yarn-project/ivc-integration/src/scripts/generate_ts_from_abi.ts b/yarn-project/ivc-integration/src/scripts/generate_ts_from_abi.ts
index 8adfaa721dcc..87442520caa7 100644
--- a/yarn-project/ivc-integration/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/ivc-integration/src/scripts/generate_ts_from_abi.ts
@@ -1,7 +1,7 @@
 import { createConsoleLogger } from '@aztec/foundation/log';
+import { codegen } from '@aztec/noir-noir_codegen';
+import { type CompiledCircuit } from '@aztec/noir-types';
 
-import { codegen } from '@noir-lang/noir_codegen';
-import { type CompiledCircuit } from '@noir-lang/types';
 import { pascalCase } from 'change-case';
 import { promises as fs } from 'fs';
 
diff --git a/yarn-project/noir-bb-bench/package.json b/yarn-project/noir-bb-bench/package.json
index 9892cdba6c63..d2c9229e6491 100644
--- a/yarn-project/noir-bb-bench/package.json
+++ b/yarn-project/noir-bb-bench/package.json
@@ -28,8 +28,8 @@
   "dependencies": {
     "@aztec/bb.js": "../../ts",
     "@aztec/foundation": "workspace:^",
-    "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen",
-    "@noir-lang/noir_js": "file:../../noir/packages/noir_js"
+    "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen",
+    "@aztec/noir-noir_js": "file:../../noir/packages/noir_js"
   },
   "devDependencies": {
     "@aztec/bb-prover": "workspace:^",
diff --git a/yarn-project/noir-bb-bench/src/index.ts b/yarn-project/noir-bb-bench/src/index.ts
index 83b837bd8b98..108b3899a97d 100644
--- a/yarn-project/noir-bb-bench/src/index.ts
+++ b/yarn-project/noir-bb-bench/src/index.ts
@@ -1,6 +1,7 @@
 /* eslint-disable camelcase */
-import { type ForeignCallOutput, Noir } from '@noir-lang/noir_js';
-import type { InputValue } from '@noir-lang/noirc_abi';
+import { type ForeignCallOutput, Noir } from '@aztec/noir-noir_js';
+import type { InputValue } from '@aztec/noir-noirc_abi';
+
 import createDebug from 'debug';
 
 // these files are generated
diff --git a/yarn-project/noir-bb-bench/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-bb-bench/src/scripts/generate_ts_from_abi.ts
index bdfa95fa02d1..fe841774f3f3 100644
--- a/yarn-project/noir-bb-bench/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-bb-bench/src/scripts/generate_ts_from_abi.ts
@@ -1,7 +1,7 @@
 import { createConsoleLogger } from '@aztec/foundation/log';
+import { codegen } from '@aztec/noir-noir_codegen';
+import { type CompiledCircuit } from '@aztec/noir-types';
 
-import { codegen } from '@noir-lang/noir_codegen';
-import { type CompiledCircuit } from '@noir-lang/types';
 import { pascalCase } from 'change-case';
 import { promises as fs } from 'fs';
 
diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json
index d4e527602349..9f40f226b4a7 100644
--- a/yarn-project/noir-protocol-circuits-types/package.json
+++ b/yarn-project/noir-protocol-circuits-types/package.json
@@ -64,11 +64,11 @@
     "@aztec/blob-lib": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js",
+    "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen",
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
+    "@aztec/noir-types": "portal:../../noir/packages/types",
     "@aztec/stdlib": "workspace:^",
-    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
-    "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen",
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
-    "@noir-lang/types": "portal:../../noir/packages/types",
     "change-case": "^5.4.4",
     "tslib": "^2.4.0"
   },
diff --git a/yarn-project/noir-protocol-circuits-types/src/execution/client.ts b/yarn-project/noir-protocol-circuits-types/src/execution/client.ts
index 9f313a69b4f7..439cf00159fb 100644
--- a/yarn-project/noir-protocol-circuits-types/src/execution/client.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/execution/client.ts
@@ -1,4 +1,7 @@
 import { pushTestData } from '@aztec/foundation/testing';
+import type { WitnessMap } from '@aztec/noir-acvm_js';
+import { abiDecode, abiEncode } from '@aztec/noir-noirc_abi';
+import type { Abi, InputMap } from '@aztec/noir-types';
 import type {
   PrivateKernelCircuitPublicInputs,
   PrivateKernelInitCircuitPrivateInputs,
@@ -8,10 +11,6 @@ import type {
   PrivateKernelTailCircuitPublicInputs,
 } from '@aztec/stdlib/kernel';
 
-import type { WitnessMap } from '@noir-lang/acvm_js';
-import { abiDecode, abiEncode } from '@noir-lang/noirc_abi';
-import type { Abi, InputMap } from '@noir-lang/types';
-
 import {
   mapPrivateCallDataToNoir,
   mapPrivateCircuitPublicInputsToNoir,
diff --git a/yarn-project/noir-protocol-circuits-types/src/execution/server.ts b/yarn-project/noir-protocol-circuits-types/src/execution/server.ts
index 6ae81d44279b..cb196b18e11e 100644
--- a/yarn-project/noir-protocol-circuits-types/src/execution/server.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/execution/server.ts
@@ -1,4 +1,6 @@
 import { pushTestData } from '@aztec/foundation/testing';
+import type { WitnessMap } from '@aztec/noir-acvm_js';
+import { abiDecode, abiEncode } from '@aztec/noir-noirc_abi';
 import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity';
 import type {
   BaseOrMergeRollupPublicInputs,
@@ -14,9 +16,6 @@ import type {
   SingleTxBlockRootRollupInputs,
 } from '@aztec/stdlib/rollup';
 
-import type { WitnessMap } from '@noir-lang/acvm_js';
-import { abiDecode, abiEncode } from '@noir-lang/noirc_abi';
-
 import { ServerCircuitArtifacts, SimulatedServerCircuitArtifacts } from '../artifacts/server.js';
 import {
   mapBaseOrMergeRollupPublicInputsFromNoir,
diff --git a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts
index 979129b559cd..8f3b49811df9 100644
--- a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts
@@ -1,7 +1,7 @@
 import { createConsoleLogger } from '@aztec/foundation/log';
+import { codegen } from '@aztec/noir-noir_codegen';
+import { type CompiledCircuit } from '@aztec/noir-types';
 
-import { codegen } from '@noir-lang/noir_codegen';
-import { type CompiledCircuit } from '@noir-lang/types';
 import { pascalCase } from 'change-case';
 import { promises as fs } from 'fs';
 
diff --git a/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts b/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts
index 911059f46b64..22a1874029f3 100644
--- a/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts
@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
+import type { ForeignCallInput, ForeignCallOutput } from '@aztec/noir-acvm_js';
 
-import type { ForeignCallInput, ForeignCallOutput } from '@noir-lang/acvm_js';
 import { strict as assert } from 'assert';
 
 function fromACVMField(field: string): Fr {
diff --git a/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts b/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts
index 5c4e26317daf..a436fd0a31ba 100644
--- a/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts
@@ -1,8 +1,8 @@
 import { Blob, BlockBlobPublicInputs, SpongeBlob } from '@aztec/blob-lib';
 import { Fr } from '@aztec/foundation/fields';
 import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
+import type { ForeignCallInput, ForeignCallOutput } from '@aztec/noir-acvm_js';
 
-import type { ForeignCallInput, ForeignCallOutput } from '@noir-lang/acvm_js';
 import { strict as assert } from 'assert';
 
 function fromACVMField(field: string): Fr {
diff --git a/yarn-project/package.json b/yarn-project/package.json
index 0d97f7da9eeb..b6d5a8109f43 100644
--- a/yarn-project/package.json
+++ b/yarn-project/package.json
@@ -81,11 +81,11 @@
   },
   "resolutions": {
     "@aztec/bb.js": "portal:../barretenberg/ts",
-    "@noir-lang/acvm_js": "portal:../noir/packages/acvm_js",
-    "@noir-lang/types": "portal:../noir/packages/types",
-    "@noir-lang/noirc_abi": "portal:../noir/packages/noirc_abi",
-    "@noir-lang/noir_codegen": "portal:../noir/packages/noir_codegen",
-    "@noir-lang/noir_js": "file:../noir/packages/noir_js",
+    "@aztec/noir-acvm_js": "portal:../noir/packages/acvm_js",
+    "@aztec/noir-types": "portal:../noir/packages/types",
+    "@aztec/noir-noirc_abi": "portal:../noir/packages/noirc_abi",
+    "@aztec/noir-noir_codegen": "portal:../noir/packages/noir_codegen",
+    "@aztec/noir-noir_js": "file:../noir/packages/noir_js",
     "jest-runner@npm:^29.7.0": "patch:jest-runner@npm%3A29.7.0#~/.yarn/patches/jest-runner-npm-29.7.0-3bc9f82b58.patch"
   }
 }
diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json
index ec79d13655bb..b8849c46bcfb 100644
--- a/yarn-project/prover-client/package.json
+++ b/yarn-project/prover-client/package.json
@@ -73,6 +73,7 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
+    "@aztec/noir-types": "portal:../../noir/packages/types",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/simulator": "workspace:^",
     "@aztec/stdlib": "workspace:^",
@@ -80,7 +81,6 @@
     "@aztec/world-state": "workspace:^",
     "@google-cloud/storage": "^7.15.0",
     "@iarna/toml": "^2.2.5",
-    "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "source-map-support": "^0.5.21",
diff --git a/yarn-project/publish_npm.sh b/yarn-project/publish_npm.sh
deleted file mode 100755
index 3aba0c4449a3..000000000000
--- a/yarn-project/publish_npm.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env bash
-[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
-set -eu
-
-echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >.npmrc
-
-# This is to be used with the 'canary' tag for testing, and then 'latest' for making it public
-DIST_TAG=${1:-"latest"}
-VERSION=$2
-
-DRY_DEPLOY=${3:-0}
-
-if [ -z "$VERSION" ]; then
-  echo "No version provided, exiting."
-  exit 1
-fi
-
-function deploy_package() {
-  REPOSITORY=$1
-  cd $REPOSITORY
-
-  PACKAGE_NAME=$(jq -r '.name' package.json)
-  echo "Deploying $REPOSITORY $VERSION $DIST_TAG"
-
-  # If the commit tag itself has a dist-tag (e.g. v2.1.0-testnet.123), extract the dist-tag.
-  TAG=$(echo "$VERSION" | grep -oP ".*-\K(.*)(?=\.\d+)" || true)
-  TAG_ARG=""
-  if [ -n "$TAG" ]; then
-    TAG_ARG="--tag $TAG"
-  else
-    TAG_ARG="--tag $DIST_TAG"
-    TAG=$DIST_TAG
-  fi
-
-  PUBLISHED_VERSION=$(npm show . version ${TAG_ARG:-} 2>/dev/null) || true
-  HIGHER_VERSION=$(npx semver ${VERSION} ${PUBLISHED_VERSION} | tail -1)
-
-  # Check if there is already a published package equal to given version, assume this is a re-run of a deploy
-  if [ "$VERSION" == "$PUBLISHED_VERSION" ]; then
-    echo "Tagged $TAG version $VERSION is equal to published $TAG version $PUBLISHED_VERSION."
-    echo "Skipping publish."
-    exit 0
-  fi
-
-  # If the published version is > the given version, something's gone wrong.
-  if [ "$VERSION" != "$HIGHER_VERSION" ]; then
-    echo "Tagged version $VERSION is lower than published version $PUBLISHED_VERSION."
-    exit 1
-  fi
-
-  # Update the package version in package.json.
-  TMP=$(mktemp)
-  jq --arg v $VERSION '.version = $v' package.json >$TMP
-  mv $TMP package.json
-
-  if [ -z "${STANDALONE:-}" ]; then
-    # Update each dependent @aztec package version in package.json.
-    for PKG in $(jq --raw-output ".dependencies | keys[] | select(contains(\"@aztec/\"))" package.json); do
-      jq --arg v $VERSION ".dependencies[\"$PKG\"] = \$v" package.json >$TMP
-      mv $TMP package.json
-    done
-
-    # TODO: Remove this after @noir-lang package resolution is fixed
-    # Hardcodes "1.0.0-beta.1" for @noir-lang packages
-    for PKG in $(jq --raw-output ".dependencies | keys[] | select(contains(\"@noir-lang/\"))" package.json); do
-      jq ".dependencies[\"$PKG\"] = \"1.0.0-beta.1\"" package.json >$TMP && mv $TMP package.json
-    done
-  fi
-
-  # Publish
-  if [ "$DRY_DEPLOY" -eq 1 ]; then
-    npm publish --dry-run $TAG_ARG --access public
-  else
-    # Check if version exists
-    if npm view "$PACKAGE_NAME@$VERSION" version >/dev/null 2>&1; then
-      # Tag the existing version
-      npm dist-tag add $PACKAGE_NAME@$VERSION $TAG
-    else
-      # Publish new version
-      npm publish $TAG_ARG --access public
-    fi
-  fi
-
-  # Return to root
-  cd ..
-}
-
-# New packages here should be added after the last package that they depend on
-deploy_package constants
-deploy_package foundation
-deploy_package blob-lib
-deploy_package native
-deploy_package stdlib
-deploy_package telemetry-client
-deploy_package protocol-contracts
-deploy_package aztec.js
-deploy_package entrypoints
-deploy_package accounts
-deploy_package l1-artifacts
-deploy_package ethereum
-deploy_package builder
-deploy_package noir-contracts.js
-deploy_package kv-store
-deploy_package merkle-tree
-deploy_package noir-protocol-circuits-types
-deploy_package world-state
-deploy_package simulator
-deploy_package bb-prover
-deploy_package key-store
-deploy_package pxe
-deploy_package archiver
-deploy_package p2p
-deploy_package prover-client
-deploy_package sequencer-client
-deploy_package bot
-deploy_package prover-node
-deploy_package aztec-node
-deploy_package txe
diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
index 04a5083b2b97..e6204c00d9e2 100644
--- a/yarn-project/pxe/package.json
+++ b/yarn-project/pxe/package.json
@@ -68,11 +68,11 @@
     "@aztec/key-store": "workspace:^",
     "@aztec/kv-store": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
+    "@aztec/noir-types": "workspace:*",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/simulator": "workspace:^",
     "@aztec/stdlib": "workspace:^",
     "@msgpack/msgpack": "^3.0.0-beta2",
-    "@noir-lang/types": "workspace:*",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts
index 115747790383..80f43560cbca 100644
--- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts
+++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts
@@ -6,6 +6,7 @@ import { assertLength } from '@aztec/foundation/serialize';
 import { pushTestData } from '@aztec/foundation/testing';
 import { Timer } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import type { WitnessMap } from '@aztec/noir-types';
 import { getProtocolContractLeafAndMembershipWitness, protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computeContractAddressFromInstance } from '@aztec/stdlib/contract';
@@ -35,8 +36,6 @@ import {
 } from '@aztec/stdlib/tx';
 import { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
-import type { WitnessMap } from '@noir-lang/types';
-
 import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js';
 import type { ProvingDataOracle } from './proving_data_oracle.js';
 
diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
index 9de8774d172e..eab74020bfed 100644
--- a/yarn-project/sequencer-client/package.json
+++ b/yarn-project/sequencer-client/package.json
@@ -38,8 +38,10 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/merkle-tree": "workspace:^",
+    "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
+    "@aztec/noir-types": "portal:../../noir/packages/types",
     "@aztec/p2p": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/prover-client": "workspace:^",
@@ -48,8 +50,6 @@
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/validator-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
-    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
-    "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",
     "lodash.pick": "^4.4.0",
     "tslib": "^2.4.0",
diff --git a/yarn-project/simulator/package.json b/yarn-project/simulator/package.json
index 703460319d56..ba7149777e35 100644
--- a/yarn-project/simulator/package.json
+++ b/yarn-project/simulator/package.json
@@ -61,14 +61,14 @@
   "dependencies": {
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js",
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
+    "@aztec/noir-types": "portal:../../noir/packages/types",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
-    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
-    "@noir-lang/types": "portal:../../noir/packages/types",
     "levelup": "^5.1.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
diff --git a/yarn-project/simulator/src/common/errors.ts b/yarn-project/simulator/src/common/errors.ts
index 5e8a27a1fa93..4fc809c01ff6 100644
--- a/yarn-project/simulator/src/common/errors.ts
+++ b/yarn-project/simulator/src/common/errors.ts
@@ -1,5 +1,7 @@
 import type { Fr } from '@aztec/foundation/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
+import type { RawAssertionPayload } from '@aztec/noir-acvm_js';
+import { abiDecodeError } from '@aztec/noir-noirc_abi';
 import type { BrilligFunctionId, FunctionAbi, FunctionDebugMetadata, OpcodeLocation } from '@aztec/stdlib/abi';
 import {
   type FailingFunction,
@@ -8,9 +10,6 @@ import {
   type SourceCodeLocation,
 } from '@aztec/stdlib/errors';
 
-import type { RawAssertionPayload } from '@noir-lang/acvm_js';
-import { abiDecodeError } from '@noir-lang/noirc_abi';
-
 /**
  * An error that occurred during the execution of a function.
  * @param message - the error message
diff --git a/yarn-project/simulator/src/private/acvm/acvm.ts b/yarn-project/simulator/src/private/acvm/acvm.ts
index eaa6ae9c6b31..d85ff1fbf4b9 100644
--- a/yarn-project/simulator/src/private/acvm/acvm.ts
+++ b/yarn-project/simulator/src/private/acvm/acvm.ts
@@ -1,13 +1,12 @@
 import { createLogger } from '@aztec/foundation/log';
-import type { FunctionDebugMetadata } from '@aztec/stdlib/abi';
-import type { NoirCallStack } from '@aztec/stdlib/errors';
-
 import {
   type ExecutionError,
   type ForeignCallInput,
   type ForeignCallOutput,
   executeCircuitWithReturnWitness,
-} from '@noir-lang/acvm_js';
+} from '@aztec/noir-acvm_js';
+import type { FunctionDebugMetadata } from '@aztec/stdlib/abi';
+import type { NoirCallStack } from '@aztec/stdlib/errors';
 
 import { resolveOpcodeLocations, traverseCauseChain } from '../../common/errors.js';
 import type { ACVMWitness } from './acvm_types.js';
diff --git a/yarn-project/simulator/src/private/acvm/acvm_types.ts b/yarn-project/simulator/src/private/acvm/acvm_types.ts
index e7431a013036..a5809755130d 100644
--- a/yarn-project/simulator/src/private/acvm/acvm_types.ts
+++ b/yarn-project/simulator/src/private/acvm/acvm_types.ts
@@ -1,4 +1,4 @@
-import type { WitnessMap } from '@noir-lang/acvm_js';
+import type { WitnessMap } from '@aztec/noir-acvm_js';
 
 /**
  * ACVMField
diff --git a/yarn-project/simulator/src/private/providers/acvm_native.ts b/yarn-project/simulator/src/private/providers/acvm_native.ts
index ecfe3e9cb0b4..9f2b1d23609b 100644
--- a/yarn-project/simulator/src/private/providers/acvm_native.ts
+++ b/yarn-project/simulator/src/private/providers/acvm_native.ts
@@ -1,9 +1,9 @@
 import { runInDirectory } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import type { WitnessMap } from '@aztec/noir-types';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
-import type { WitnessMap } from '@noir-lang/types';
 import * as proc from 'child_process';
 import { promises as fs } from 'fs';
 
diff --git a/yarn-project/simulator/src/private/providers/acvm_wasm.ts b/yarn-project/simulator/src/private/providers/acvm_wasm.ts
index e25382321ed7..70ec0d2ad428 100644
--- a/yarn-project/simulator/src/private/providers/acvm_wasm.ts
+++ b/yarn-project/simulator/src/private/providers/acvm_wasm.ts
@@ -1,11 +1,10 @@
 import { createLogger } from '@aztec/foundation/log';
+import initACVM, { type ExecutionError, executeCircuit } from '@aztec/noir-acvm_js';
+import initAbi from '@aztec/noir-noirc_abi';
 import { foreignCallHandler } from '@aztec/noir-protocol-circuits-types/client';
+import type { WitnessMap } from '@aztec/noir-types';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
-import initACVM, { type ExecutionError, executeCircuit } from '@noir-lang/acvm_js';
-import initAbi from '@noir-lang/noirc_abi';
-import type { WitnessMap } from '@noir-lang/types';
-
 import { type ACIRCallback, acvm } from '../acvm/acvm.js';
 import type { ACVMWitness } from '../acvm/acvm_types.js';
 import { type SimulationProvider, parseErrorPayload } from './simulation_provider.js';
diff --git a/yarn-project/simulator/src/private/providers/acvm_wasm_with_blobs.ts b/yarn-project/simulator/src/private/providers/acvm_wasm_with_blobs.ts
index 963841f00ec4..7245264ba518 100644
--- a/yarn-project/simulator/src/private/providers/acvm_wasm_with_blobs.ts
+++ b/yarn-project/simulator/src/private/providers/acvm_wasm_with_blobs.ts
@@ -1,9 +1,8 @@
+import { type ExecutionError, executeCircuit } from '@aztec/noir-acvm_js';
 import { foreignCallHandler } from '@aztec/noir-protocol-circuits-types/server';
+import type { WitnessMap } from '@aztec/noir-types';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
-import { type ExecutionError, executeCircuit } from '@noir-lang/acvm_js';
-import type { WitnessMap } from '@noir-lang/types';
-
 import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js';
 import type { ACVMWitness } from '../acvm/acvm_types.js';
 import { type SimulationProvider, parseErrorPayload } from './simulation_provider.js';
diff --git a/yarn-project/simulator/src/private/providers/simulation_provider.ts b/yarn-project/simulator/src/private/providers/simulation_provider.ts
index 0c73f21d3158..5ec7229d3e7b 100644
--- a/yarn-project/simulator/src/private/providers/simulation_provider.ts
+++ b/yarn-project/simulator/src/private/providers/simulation_provider.ts
@@ -1,9 +1,8 @@
+import type { ExecutionError } from '@aztec/noir-acvm_js';
+import { abiDecodeError } from '@aztec/noir-noirc_abi';
+import type { Abi, WitnessMap } from '@aztec/noir-types';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
-import type { ExecutionError } from '@noir-lang/acvm_js';
-import { abiDecodeError } from '@noir-lang/noirc_abi';
-import type { Abi, WitnessMap } from '@noir-lang/types';
-
 import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js';
 import type { ACVMWitness } from '../acvm/acvm_types.js';
 
diff --git a/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts b/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts
index c68fbd6ee59d..925e308db36e 100644
--- a/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts
+++ b/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts
@@ -1,4 +1,4 @@
-import type { WitnessMap } from '@noir-lang/acvm_js';
+import type { WitnessMap } from '@aztec/noir-acvm_js';
 
 import type {
   PrivateKernelCircuitPublicInputs,
diff --git a/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts b/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts
index d6d14d160e1b..ca71bca96b39 100644
--- a/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts
+++ b/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts
@@ -1,4 +1,4 @@
-import type { WitnessMap } from '@noir-lang/acvm_js';
+import type { WitnessMap } from '@aztec/noir-acvm_js';
 
 import type { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import type { VerificationKeyAsFields } from '../vks/verification_key.js';
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index b0d3a5edd05a..9be881a44307 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -288,9 +288,9 @@ __metadata:
     "@aztec/bb-prover": "workspace:^"
     "@aztec/bb.js": ../../ts
     "@aztec/foundation": "workspace:^"
+    "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen"
+    "@aztec/noir-noir_js": "file:../../noir/packages/noir_js"
     "@jest/globals": "npm:^29.5.0"
-    "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen"
-    "@noir-lang/noir_js": "file:../../noir/packages/noir_js"
     "@types/jest": "npm:^29.5.0"
     "@types/node": "npm:^22.8.1"
     debug: "npm:^4.3.4"
@@ -318,7 +318,9 @@ __metadata:
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
+    "@aztec/noir-types": "portal:../../noir/packages/types"
     "@aztec/protocol-contracts": "workspace:^"
     "@aztec/simulator": "workspace:^"
     "@aztec/stdlib": "workspace:^"
@@ -326,8 +328,6 @@ __metadata:
     "@aztec/world-state": "workspace:^"
     "@jest/globals": "npm:^29.5.0"
     "@msgpack/msgpack": "npm:^3.0.0-beta2"
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi"
-    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": "npm:^29.5.0"
     "@types/memdown": "npm:^3.0.0"
     "@types/node": "npm:^18.7.23"
@@ -781,16 +781,16 @@ __metadata:
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
+    "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen"
+    "@aztec/noir-noir_js": "file:../../noir/packages/noir_js"
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi"
+    "@aztec/noir-types": "portal:../../noir/packages/types"
     "@aztec/simulator": "workspace:^"
     "@aztec/stdlib": "workspace:^"
     "@aztec/telemetry-client": "workspace:^"
     "@aztec/world-state": "workspace:^"
     "@jest/globals": "npm:^29.5.0"
     "@msgpack/msgpack": "npm:^3.0.0-beta2"
-    "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen"
-    "@noir-lang/noir_js": "file:../../noir/packages/noir_js"
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi"
-    "@noir-lang/types": "portal:../../noir/packages/types"
     "@playwright/test": "npm:1.49.0"
     "@types/jest": "npm:^29.5.0"
     "@types/node": "npm:^22.8.1"
@@ -918,6 +918,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@aztec/noir-acvm_js@portal:../noir/packages/acvm_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/noir-acvm_js@portal:../noir/packages/acvm_js::locator=%40aztec%2Faztec3-packages%40workspace%3A."
+  languageName: node
+  linkType: soft
+
 "@aztec/noir-contracts.js@workspace:^, @aztec/noir-contracts.js@workspace:noir-contracts.js":
   version: 0.0.0-use.local
   resolution: "@aztec/noir-contracts.js@workspace:noir-contracts.js"
@@ -933,6 +939,37 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@aztec/noir-noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/noir-noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A."
+  dependencies:
+    "@aztec/noir-types": "npm:1.0.0-beta.3"
+    glob: "npm:^10.3.10"
+    ts-command-line-args: "npm:^2.5.1"
+  bin:
+    noir-codegen: lib/main.js
+  languageName: node
+  linkType: soft
+
+"@aztec/noir-noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
+  version: 1.0.0-beta.3
+  resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=1c440e&locator=%40aztec%2Faztec3-packages%40workspace%3A."
+  dependencies:
+    "@aztec/noir-acvm_js": "npm:1.0.0-beta.3"
+    "@aztec/noir-noirc_abi": "npm:1.0.0-beta.3"
+    "@aztec/noir-types": "npm:1.0.0-beta.3"
+  checksum: 10/08fd293b038e8e3700f6a5dede8ad80ed8254ad49f177dc4e4f3b0528661621f36bf02a2335dd7002ae0caf9ca6bdbc7c494e4093a40b1e58acb37352dcf22dd
+  languageName: node
+  linkType: hard
+
+"@aztec/noir-noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/noir-noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A."
+  dependencies:
+    "@aztec/noir-types": "npm:1.0.0-beta.3"
+  languageName: node
+  linkType: soft
+
 "@aztec/noir-protocol-circuits-types@workspace:^, @aztec/noir-protocol-circuits-types@workspace:noir-protocol-circuits-types":
   version: 0.0.0-use.local
   resolution: "@aztec/noir-protocol-circuits-types@workspace:noir-protocol-circuits-types"
@@ -942,12 +979,12 @@ __metadata:
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
+    "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js"
+    "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen"
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi"
+    "@aztec/noir-types": "portal:../../noir/packages/types"
     "@aztec/stdlib": "workspace:^"
     "@jest/globals": "npm:^29.5.0"
-    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
-    "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen"
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi"
-    "@noir-lang/types": "portal:../../noir/packages/types"
     "@swc/helpers": "npm:^0.5.15"
     "@types/jest": "npm:^29.5.0"
     "@types/node": "npm:^18.7.23"
@@ -961,6 +998,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@aztec/noir-types@portal:../noir/packages/types::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/noir-types@portal:../noir/packages/types::locator=%40aztec%2Faztec3-packages%40workspace%3A."
+  languageName: node
+  linkType: soft
+
 "@aztec/p2p-bootstrap@workspace:^, @aztec/p2p-bootstrap@workspace:p2p-bootstrap":
   version: 0.0.0-use.local
   resolution: "@aztec/p2p-bootstrap@workspace:p2p-bootstrap"
@@ -1073,6 +1116,7 @@ __metadata:
     "@aztec/kv-store": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
+    "@aztec/noir-types": "portal:../../noir/packages/types"
     "@aztec/protocol-contracts": "workspace:^"
     "@aztec/simulator": "workspace:^"
     "@aztec/stdlib": "workspace:^"
@@ -1081,7 +1125,6 @@ __metadata:
     "@google-cloud/storage": "npm:^7.15.0"
     "@iarna/toml": "npm:^2.2.5"
     "@jest/globals": "npm:^29.5.0"
-    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": "npm:^29.5.0"
     "@types/memdown": "npm:^3.0.0"
     "@types/node": "npm:^18.7.23"
@@ -1150,12 +1193,12 @@ __metadata:
     "@aztec/kv-store": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
+    "@aztec/noir-types": "workspace:*"
     "@aztec/protocol-contracts": "workspace:^"
     "@aztec/simulator": "workspace:^"
     "@aztec/stdlib": "workspace:^"
     "@jest/globals": "npm:^29.5.0"
     "@msgpack/msgpack": "npm:^3.0.0-beta2"
-    "@noir-lang/types": "workspace:*"
     "@types/jest": "npm:^29.5.0"
     "@types/lodash.omit": "npm:^4.5.7"
     "@types/lodash.times": "npm:^4.3.9"
@@ -1213,8 +1256,10 @@ __metadata:
     "@aztec/kv-store": "workspace:^"
     "@aztec/l1-artifacts": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
+    "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
+    "@aztec/noir-types": "portal:../../noir/packages/types"
     "@aztec/p2p": "workspace:^"
     "@aztec/protocol-contracts": "workspace:^"
     "@aztec/prover-client": "workspace:^"
@@ -1224,8 +1269,6 @@ __metadata:
     "@aztec/validator-client": "workspace:^"
     "@aztec/world-state": "workspace:^"
     "@jest/globals": "npm:^29.5.0"
-    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
-    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": "npm:^29.5.0"
     "@types/levelup": "npm:^5.1.2"
     "@types/lodash.chunk": "npm:^4.2.7"
@@ -1257,16 +1300,16 @@ __metadata:
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
+    "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js"
     "@aztec/noir-contracts.js": "workspace:^"
+    "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
+    "@aztec/noir-types": "portal:../../noir/packages/types"
     "@aztec/protocol-contracts": "workspace:^"
     "@aztec/stdlib": "workspace:^"
     "@aztec/telemetry-client": "workspace:^"
     "@aztec/world-state": "workspace:^"
     "@jest/globals": "npm:^29.5.0"
-    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
-    "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi"
-    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": "npm:^29.5.0"
     "@types/levelup": "npm:^5.1.3"
     "@types/lodash.clonedeep": "npm:^4.5.7"
@@ -4149,49 +4192,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noir-lang/acvm_js@portal:../noir/packages/acvm_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/acvm_js@portal:../noir/packages/acvm_js::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  languageName: node
-  linkType: soft
-
-"@noir-lang/noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  dependencies:
-    "@noir-lang/types": "npm:1.0.0-beta.3"
-    glob: "npm:^10.3.10"
-    ts-command-line-args: "npm:^2.5.1"
-  bin:
-    noir-codegen: lib/main.js
-  languageName: node
-  linkType: soft
-
-"@noir-lang/noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 1.0.0-beta.3
-  resolution: "@noir-lang/noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=73647e&locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  dependencies:
-    "@noir-lang/acvm_js": "npm:1.0.0-beta.3"
-    "@noir-lang/noirc_abi": "npm:1.0.0-beta.3"
-    "@noir-lang/types": "npm:1.0.0-beta.3"
-  checksum: 10/4e756f69e5c8fcfe4f1243f026e37d68584852ad18887414ccc74de928ff2c019ea785ae06e48c523744676ccff2993b4d3ed8b971d6478e431af38574b4e924
-  languageName: node
-  linkType: hard
-
-"@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  dependencies:
-    "@noir-lang/types": "npm:1.0.0-beta.3"
-  languageName: node
-  linkType: soft
-
-"@noir-lang/types@portal:../noir/packages/types::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/types@portal:../noir/packages/types::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "@npmcli/agent@npm:^2.0.0":
   version: 2.2.2
   resolution: "@npmcli/agent@npm:2.2.2"