diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
index 22e0ed9..16cbfd5 100644
--- a/.github/workflows/validate.yaml
+++ b/.github/workflows/validate.yaml
@@ -4,37 +4,26 @@ name: Validate
 on:
   pull_request:
     types: [opened, synchronize]
-
 jobs:
   build:
     name: Validate
     runs-on: ubuntu-latest
+    env:
+      MASSDRIVER_API_KEY: ${{ secrets.MASSDRIVER_BETA_RELEASE_CHANNEL_API_KEY }}
+      MASSDRIVER_ORG_ID: ${{ secrets.MASSDRIVER_BETA_RELEASE_CHANNEL_ORGANIZATION_ID }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Download Massdriver CLI
-        uses: dsaltares/fetch-gh-release-asset@0.0.8
-        with:
-          repo: "massdriver-cloud/massdriver-cli"
-          file: "^mass-.*-linux-amd64\\.tar\\.gz$"
-          regex: true
-          token: ${{ secrets.ORGANIZATION_GITHUB_TOKEN }}
-
-      - name: Build
-        env:
-          MASSDRIVER_API_KEY: ${{ secrets.MASSDRIVER_BETA_RELEASE_CHANNEL_API_KEY }}
-        run: tar -xzf mass-*.tar.gz -C /usr/local/bin && rm -rf mass-*.tar.gz .git* && mass bundle build massdriver.yaml
-
+        uses: actions/checkout@v3
+      - name: Install Massdriver CLI
+        uses: massdriver-cloud/actions@v5
+      - name: Build Bundle
+        uses: massdriver-cloud/actions/bundle_build@v5
       - name: Validate params schema
         run: mass schema validate -s https://json-schema.org/draft-07/schema -d ./schema-params.json
-
       - name: Validate connections schema
         run: mass schema validate -s https://json-schema.org/draft-07/schema -d ./schema-connections.json
-
       - name: Validate artifacts schema
         run: mass schema validate -s https://json-schema.org/draft-07/schema -d ./schema-artifacts.json
-
       - name: Terraform validate
         uses: dflook/terraform-validate@v1
         id: validate