diff --git a/.github/workflows/publish.yml b/.github/workflows/build.yml
similarity index 52%
rename from .github/workflows/publish.yml
rename to .github/workflows/build.yml
index c2e507f..d05f658 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,13 @@
-name: Bundle Website
-on: push
+name: Build Website
+
+on:
+  push:
+    branches:
+      - "*"
+      # Master has its own set of build rules,
+      # and will eventually call this script on its own
+      - "!master"
+  workflow_call:
 
 jobs:
   build:
@@ -33,29 +41,5 @@ jobs:
       - name: Publish site as artifact
         uses: actions/upload-artifact@v2
         with:
-          name: website
+          name: website-static-bundle
           path: ./public
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    if: github.ref == 'refs/heads/master'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      
-      - name: Download website bundle
-        uses: actions/download-artifact@v2
-        with:
-          name: website
-          path: ./public
-
-      - name: Deploy to GitHub Pages
-        if: success()
-        uses: crazy-max/ghaction-github-pages@v2
-        with:
-          target_branch: gh-pages
-          build_dir: public
-          fqdn: ewpratten.com
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..fcfc5e7
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,29 @@
+name: Deploy
+on:
+  push:
+    branches:
+      - "master"
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download bundle artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: website
+          path: ./public
+
+      - name: Deploy to GitHub Pages
+        if: success()
+        uses: crazy-max/ghaction-github-pages@v2
+        with:
+          target_branch: gh-pages
+          build_dir: public
+          fqdn: ewpratten.com
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}