diff --git a/.github/workflows/github_action_build_docs.yml b/.github/workflows/github_action_build_docs.yml
index f9ba95fcda..53cfabb3a3 100644
--- a/.github/workflows/github_action_build_docs.yml
+++ b/.github/workflows/github_action_build_docs.yml
@@ -21,38 +21,25 @@ jobs:
         python-version: [3.7]
 
     steps:
-      - uses: actions/checkout@v2
-        with: 
-          fetch-depth: 0
-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install doc-building dependencies
-        run: |
-          python -m pip install --upgrade pip
-          cd docs/
-          make install
-
-      # full game dir needed for mv-local
-      - name: Set up evennia game dir
+      - uses: actions/checkout@v2
         if: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'}}
+        with: 
+          fetch-depth: 0
         run: |
+          git config --global user.email "docbuilder@evennia.com"
+          git config --global user.name "Evennia docbuilder action"
+          python -m pip install --upgrade pip
           pip install -e .
           pip install -r requirements_extra.txt
           cd ..
           evennia --init gamedir
           cd gamedir
           evennia migrate
-
-      - name: Build and deploy docs (only from master/develop branch)
-        if: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'}}
-        run: |
-          git checkout v0.9.5
-          git checkout develop
-          git config --global user.email "docbuilder@evennia.com"
-          git config --global user.name "Evennia docbuilder action"
-          cd docs
+          cd ../evennia/docs/
+          make install
           make release
diff --git a/docs/Makefile b/docs/Makefile
index 748dd61c9e..92780c2e48 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,6 +3,7 @@
 SOURCEDIR     = source
 BUILDDIR      = build
 AUTODOCDIR = $(SOURCEDIR)/api
+
 # You can set these variables from the command line, and also
 # from the environment for the first two.
 SPHINXOPTS    ?=