diff --git a/.github/workflows/guide-main-deploy.yml b/.github/workflows/guide-main-deploy.yml
new file mode 100644
index 0000000000..ad8811e6f6
--- /dev/null
+++ b/.github/workflows/guide-main-deploy.yml
@@ -0,0 +1,52 @@
+name: Meteor Guide main deploy
+on:
+  push:
+    paths:
+      - 'guide/**/*'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: guide/site/
+    if:
+      contains('
+      refs/heads/devel
+      refs/heads/master
+      ', github.ref)
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test build
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - run: npm ci && npm run build
+  deploy:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: guide/site/
+    needs: [test]
+    if:
+      contains('
+      refs/heads/devel
+      refs/heads/master
+      ', github.ref)
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: Build the Guide
+        run: npm ci && npm run build
+      - name: Deploy to Netlify for preview
+        uses: nwtgck/actions-netlify@v1.2.2
+        with:
+          publish-dir: './guide/site/public'
+          production-branch: devel
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          deploy-message: "Deploy from GitHub Actions"
+          netlify-config-path: './guide/netlify.toml'
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GUIDE_SITE_ID }}
diff --git a/.github/workflows/guide.yml b/.github/workflows/guide.yml
index 17f3159575..e30862b988 100644
--- a/.github/workflows/guide.yml
+++ b/.github/workflows/guide.yml
@@ -1,4 +1,4 @@
-name: Meteor Guide
+name: Meteor Guide PR
 on:
   push:
     paths:
@@ -73,32 +73,3 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GUIDE_SITE_ID }}
-  deploy:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: guide/site/
-    needs: [test]
-    if:
-      contains('
-      refs/heads/devel
-      refs/heads/master
-      ', github.ref)
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Build the Guide
-        run: npm ci && npm run build
-      - name: Deploy to Netlify for preview
-        uses: nwtgck/actions-netlify@v1.2.2
-        with:
-          publish-dir: './guide/site/public'
-          production-branch: devel
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          deploy-message: "Deploy from GitHub Actions"
-          netlify-config-path: './guide/netlify.toml'
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GUIDE_SITE_ID }}
diff --git a/docs/data/.gitkeep b/docs/data/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2