diff --git a/.github/workflows/build_and_publish_docs.yaml b/.github/workflows/build_and_publish_docs.yaml
new file mode 100644
index 0000000000..7f5f4ca10e
--- /dev/null
+++ b/.github/workflows/build_and_publish_docs.yaml
@@ -0,0 +1,48 @@
+name: Build and Update Docs
+
+on:
+  push:
+    branches: [ master ]
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build_and_publish_docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v2
+      - name: Setup conda env
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          miniconda-version: "latest"
+          activate-environment: test
+      - name: Install dependencies
+        shell: bash -l {0}
+        run: |
+          set -eux
+          conda activate test
+          pip install -r requirements.txt
+          pip install -r dev-requirements.txt
+          conda install pytorch cpuonly -c pytorch-nightly
+          python setup.py sdist bdist_wheel
+          pip install dist/*.whl
+      - name: Build docs
+        shell: bash -l {0}
+        run: |
+          set -eux
+          conda activate test
+          cd docs
+          pip install -r requirements.txt
+          make html
+          touch build/html/.nojekyll
+          cd ..
+      - name: Deploy docs to Github pages
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        with:
+            branch: gh-pages # The branch the action should deploy to.
+            folder: docs/build/html # The folder the action should deploy.
+            target-folder: master
diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml
index 892911a93e..711f4da45f 100644
--- a/.github/workflows/build_docs.yaml
+++ b/.github/workflows/build_docs.yaml
@@ -1,8 +1,6 @@
-name: Build and Update Docs
+name: Build Docs
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
 
 # Allow one concurrent deployment
@@ -41,13 +39,3 @@ jobs:
           make html
           touch build/html/.nojekyll
           cd ..
-  publish_docs:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
-    steps:
-      - name: Deploy docs to Github pages
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
-        with:
-            branch: gh-pages # The branch the action should deploy to.
-            folder: docs/build/html # The folder the action should deploy.
-            target-folder: master