diff --git a/.github/workflows/build-blocks.yml b/.github/workflows/build-blocks.yml
index 9aad982e..1d3becf8 100644
--- a/.github/workflows/build-blocks.yml
+++ b/.github/workflows/build-blocks.yml
@@ -19,15 +19,19 @@ jobs:
             - name: Setup
               uses: WordPress/wporg-repo-tools/.github/actions/setup@trunk
               with:
+                packageManager: "npm"
                 token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Remove build artifacts
               run: |
                   rm -rf public_html/wp-content/themes/wporg-pattern-directory-2024/node_modules
+                  rm -rf public_html/wp-content/plugins/pattern-creator/node_modules
+                  rm -rf public_html/wp-content/plugins/pattern-directory/node_modules
 
             - name: Ignore .gitignore
               run: |
                   git add public_html/wp-content/themes/wporg-pattern-directory-2024/* --force
+                  git add public_html/wp-content/plugins/pattern-*/build --force
 
             - name: Append build number to version
               run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 5f273e7e..00000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Build and push to build branch.
-
-on:
-    push:
-        branches:
-            - trunk
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-
-            - name: Install NodeJS
-              uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-              with:
-                  node-version-file: '.nvmrc'
-                  cache: npm
-
-            - name: Set PHP version
-              uses: shivammathur/setup-php@e04e1d97f0c0481c6e1ba40f8a538454fe5d7709 # v2.21.2
-              with:
-                  php-version: 7.4
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install PHP dependencies
-              run: |
-                  composer install
-
-            - name: Install JS dependencies
-              run: |
-                  npm install
-
-            - name: Build
-              run: npm run build --workspaces
-
-            - name: Ignore .gitignore
-              run: |
-                  git add public_html/wp-content/themes/pattern-directory/css/* --force
-                  git add public_html/wp-content/themes/pattern-directory/build --force || exit 0
-                  git add public_html/wp-content/plugins/pattern-*/build --force
-
-            - name: Commit and push
-              # Using a specific hash here instead of a tagged version, for risk mitigation, since this action modifies our repo.
-              uses: actions-js/push@9624971e5ca3184618b29686baf638e14f65bd14
-              with:
-                  github_token: ${{ secrets.GITHUB_TOKEN }}
-                  branch: build
-                  force: true
-                  message: 'Build: ${{ github.sha }}'
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index efac662a..7433d8b9 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -16,32 +16,11 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
-            - name: Install NodeJS
-              uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
+            - name: Setup
+              uses: WordPress/wporg-repo-tools/.github/actions/setup@trunk
               with:
-                  node-version-file: '.nvmrc'
-                  cache: npm
+                packageManager: "npm"
+                token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Install JS dependencies
-              run: |
-                  npm install
-
-            - name: Set PHP version
-              uses: shivammathur/setup-php@e04e1d97f0c0481c6e1ba40f8a538454fe5d7709 # v2.21.2
-              with:
-                  php-version: 7.4
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install PHP dependencies
-              run: |
-                  composer install
-
-            - name: Lint JavaScript and Styles
-              run: |
-                  npm run lint:js --workspaces -- --quiet
-                  npm run lint:css --workspaces
-
-            - name: Lint PHP
-              run: |
-                  composer run lint
+            - name: Lint
+              uses: WordPress/wporg-repo-tools/.github/actions/lint@trunk
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index d0de4ebd..bd546047 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -22,29 +22,11 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
-            - name: Set PHP version
-              uses: shivammathur/setup-php@e04e1d97f0c0481c6e1ba40f8a538454fe5d7709 # v2.21.2
+            - name: Setup
+              uses: WordPress/wporg-repo-tools/.github/actions/setup@trunk
               with:
-                  php-version: 7.4
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install PHP dependencies
-              run: |
-                  composer install
-
-            - name: Install NodeJS
-              uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-              with:
-                  node-version-file: '.nvmrc'
-                  cache: npm
-
-            - name: Install JS dependencies
-              run: |
-                  npm install
-
-            - name: Build
-              run: npm run build --workspaces
+                packageManager: "npm"
+                token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Install WordPress
               run: |
@@ -66,29 +48,11 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
-            - name: Install NodeJS
-              uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
+            - name: Setup
+              uses: WordPress/wporg-repo-tools/.github/actions/setup@trunk
               with:
-                  node-version-file: '.nvmrc'
-                  cache: npm
-
-            - name: Set PHP version
-              uses: shivammathur/setup-php@e04e1d97f0c0481c6e1ba40f8a538454fe5d7709 # v2.21.2
-              with:
-                  php-version: 7.4
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install PHP dependencies
-              run: |
-                  composer install
-
-            - name: Install JS dependencies
-              run: |
-                  npm
-
-            - name: Build
-              run: npm run build --workspaces
+                packageManager: "npm"
+                token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Run unit tests on theme data store
               run: npm run test:unit --workspace=wporg-pattern-directory-theme