diff --git a/.circleci/config.yml b/.circleci/config.yml
index 60bb80eaf449..8bcd6c44a01a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,7 +163,6 @@ workflows:
           requires:
             - prep-deps
       - prep-build-test-flask-mv2:
-          <<: *main_master_rc_only
           requires:
             - prep-deps
       - prep-build-test-mmi:
@@ -301,10 +300,14 @@ workflows:
             - prep-deps
             - prep-build
             - prep-build-mv2
-            - trigger-beta-build
             - prep-build-mmi
             - prep-build-flask
             - prep-build-flask-mv2
+            - prep-build-test
+            - prep-build-test-mv2
+            - prep-build-test-flask
+            - prep-build-test-flask-mv2
+            - trigger-beta-build
             - prep-build-storybook
             - prep-build-ts-migration-dashboard
             - benchmark
@@ -765,10 +768,10 @@ jobs:
           name: Build extension for testing
           command: yarn build:test:flask:mv2
       - run:
-          name: Move test build to 'dist-test-flask' to avoid conflict with production build
+          name: Move test build to 'dist-test-flask-mv2' to avoid conflict with production build
           command: mv ./dist ./dist-test-flask-mv2
       - run:
-          name: Move test zips to 'builds-test-flask' to avoid conflict with production build
+          name: Move test zips to 'builds-test-flask-mv2' to avoid conflict with production build
           command: mv ./builds ./builds-test-flask-mv2
       - persist_to_workspace:
           root: .
@@ -1408,8 +1411,12 @@ jobs:
           destination: builds-mv2
       - store_artifacts:
           path: builds-test
+      - store_artifacts:
+          path: builds-test-mv2
       - store_artifacts:
           path: builds-test-flask
+      - store_artifacts:
+          path: builds-test-flask-mv2
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
diff --git a/development/metamaskbot-build-announce.js b/development/metamaskbot-build-announce.js
index f85d64faa887..0173206d7a05 100755
--- a/development/metamaskbot-build-announce.js
+++ b/development/metamaskbot-build-announce.js
@@ -65,50 +65,34 @@ async function start() {
   // build the github comment content
 
   // links to extension builds
-  const platforms = ['chrome', 'firefox'];
-  const buildLinks = platforms
-    .map((platform) => {
-      const url =
-        platform === 'firefox'
-          ? `${BUILD_LINK_BASE}/builds-mv2/metamask-${platform}-${VERSION}.zip`
-          : `${BUILD_LINK_BASE}/builds/metamask-${platform}-${VERSION}.zip`;
-      return `<a href="${url}">${platform}</a>`;
-    })
-    .join(', ');
-  const betaBuildLinks = `<a href="${BUILD_LINK_BASE}/builds-beta/metamask-beta-chrome-${VERSION}.zip">chrome</a>`;
-  const flaskBuildLinks = platforms
-    .map((platform) => {
-      const url =
-        platform === 'firefox'
-          ? `${BUILD_LINK_BASE}/builds-flask-mv2/metamask-flask-${platform}-${VERSION}-flask.0.zip`
-          : `${BUILD_LINK_BASE}/builds-flask/metamask-flask-${platform}-${VERSION}-flask.0.zip`;
-      return `<a href="${url}">${platform}</a>`;
-    })
-    .join(', ');
-  const mmiBuildLinks = platforms
-    .map((platform) => {
-      const url = `${BUILD_LINK_BASE}/builds-mmi/metamask-mmi-${platform}-${VERSION}-mmi.0.zip`;
-      return `<a href="${url}">${platform}</a>`;
-    })
-    .join(', ');
-  const testBuildLinks = platforms
-    .map((platform) => {
-      const url =
-        platform === 'firefox'
-          ? `${BUILD_LINK_BASE}/builds-test-mv2/metamask-${platform}-${VERSION}.zip`
-          : `${BUILD_LINK_BASE}/builds-test/metamask-${platform}-${VERSION}.zip`;
-      return `<a href="${url}">${platform}</a>`;
-    })
-    .join(', ');
-  const testFlaskBuildLinks = platforms
-    .map((platform) => {
-      const url =
-        platform === 'firefox'
-          ? `${BUILD_LINK_BASE}/builds-test-flask-mv2/metamask-flask-${platform}-${VERSION}-flask.0.zip`
-          : `${BUILD_LINK_BASE}/builds-test-flask/metamask-flask-${platform}-${VERSION}-flask.0.zip`;
+  const buildMap = {
+    builds: {
+      chrome: `${BUILD_LINK_BASE}/builds/metamask-chrome-${VERSION}.zip`,
+      firefox: `${BUILD_LINK_BASE}/builds-mv2/metamask-firefox-${VERSION}.zip`,
+    },
+    'builds (flask)': {
+      chrome: `${BUILD_LINK_BASE}/builds-flask/metamask-flask-chrome-${VERSION}-flask.0.zip`,
+      firefox: `${BUILD_LINK_BASE}/builds-flask-mv2/metamask-flask-firefox-${VERSION}-flask.0.zip`,
+    },
+    'builds (MMI)': {
+      chrome: `${BUILD_LINK_BASE}/builds-mmi/metamask-mmi-chrome-${VERSION}-mmi.0.zip`,
+    },
+    'builds (test)': {
+      chrome: `${BUILD_LINK_BASE}/builds-test/metamask-chrome-${VERSION}.zip`,
+      firefox: `${BUILD_LINK_BASE}/builds-test-mv2/metamask-firefox-${VERSION}.zip`,
+    },
+    'builds (test-flask)': {
+      chrome: `${BUILD_LINK_BASE}/builds-test-flask/metamask-flask-chrome-${VERSION}-flask.0.zip`,
+      firefox: `${BUILD_LINK_BASE}/builds-test-flask-mv2/metamask-flask-firefox-${VERSION}-flask.0.zip`,
+    },
+  };
+
+  const buildContentRows = Object.entries(buildMap).map(([label, builds]) => {
+    const buildLinks = Object.entries(builds).map(([platform, url]) => {
       return `<a href="${url}">${platform}</a>`;
-    })
-    .join(', ');
+    });
+    return `${label}: ${buildLinks.join(', ')}`;
+  });
 
   // links to bundle browser builds
   const bundles = {};
@@ -171,12 +155,7 @@ async function start() {
   const allArtifactsUrl = `https://circleci.com/gh/MetaMask/metamask-extension/${CIRCLE_BUILD_NUM}#artifacts/containers/0`;
 
   const contentRows = [
-    `builds: ${buildLinks}`,
-    `builds (beta): ${betaBuildLinks}`,
-    `builds (flask): ${flaskBuildLinks}`,
-    `builds (MMI): ${mmiBuildLinks}`,
-    `builds (test): ${testBuildLinks}`,
-    `builds (test-flask): ${testFlaskBuildLinks}`,
+    ...buildContentRows,
     `build viz: ${depVizLink}`,
     `mv3: ${moduleInitStatsBackgroundLink}`,
     `mv3: ${moduleInitStatsUILink}`,
@@ -198,8 +177,9 @@ async function start() {
   const exposedContent = `Builds ready [${SHORT_SHA1}]`;
   const artifactsBody = `<details><summary>${exposedContent}</summary>${hiddenContent}</details>\n\n`;
 
+  const benchmarkPlatforms = ['chrome'];
   const benchmarkResults = {};
-  for (const platform of platforms) {
+  for (const platform of benchmarkPlatforms) {
     const benchmarkPath = path.resolve(
       __dirname,
       '..',