From 6cdd1ce728d9f8fd0e923c58b7340ad1244d8086 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Fri, 8 Sep 2023 15:46:06 +0000
Subject: [PATCH 1/2] Enabled components in tags

---
 .circleci/config.yml                 | 2 +-
 .github/workflows/release_please.yml | 1 -
 build-system/scripts/setup_env       | 2 +-
 release-please-config.json           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e00eadcb9db..c82c96bcf7e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1216,7 +1216,7 @@ jobs:
           command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary scripts/docker-compose.yml
 
 # Repeatable config for defining the workflow below.
-tag_regex: &tag_regex /^v.*/
+tag_regex: &tag_regex /^aztec-packages-v.*/
 defaults: &defaults
   filters:
     tags:
diff --git a/.github/workflows/release_please.yml b/.github/workflows/release_please.yml
index 636d4c57b59..240aab5b1f1 100644
--- a/.github/workflows/release_please.yml
+++ b/.github/workflows/release_please.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - master
-      - pw/bb-releases
 
 permissions:
   contents: write
diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
index 87df5608169..c8d46876256 100755
--- a/build-system/scripts/setup_env
+++ b/build-system/scripts/setup_env
@@ -9,7 +9,7 @@
 set -eu
 
 COMMIT_HASH=$1
-COMMIT_TAG=$2
+COMMIT_TAG=${$2##*aztec-packages-}
 JOB_NAME=$3
 GIT_REPOSITORY_URL=${4:-}
 BRANCH=${5:-}
diff --git a/release-please-config.json b/release-please-config.json
index fc4498e454e..ad2f1a56895 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -6,7 +6,7 @@
   "group-pull-request-title-pattern": "chore(master): Release ${version}",
   "pull-request-header": ":robot: I have created a new Aztec Packages release",
   "versioning": "default",
-  "include-component-in-tag": false,
+  "include-component-in-tag": true,
   "changelog-sections": [
     { "type": "feat", "section": "Features", "hidden": false },
     { "type": "fix", "section": "Bug Fixes", "hidden": false },

From 14dfac2c448279840c966b2c7f576bcf9c7f2ad3 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Fri, 8 Sep 2023 15:50:59 +0000
Subject: [PATCH 2/2] Fix

---
 build-system/scripts/setup_env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
index c8d46876256..d0366079050 100755
--- a/build-system/scripts/setup_env
+++ b/build-system/scripts/setup_env
@@ -9,7 +9,7 @@
 set -eu
 
 COMMIT_HASH=$1
-COMMIT_TAG=${$2##*aztec-packages-}
+COMMIT_TAG=${2##*aztec-packages-}
 JOB_NAME=$3
 GIT_REPOSITORY_URL=${4:-}
 BRANCH=${5:-}