diff --git a/.github/workflows/docs_dev.yaml b/.github/workflows/docs_main.yaml
similarity index 62%
rename from .github/workflows/docs_dev.yaml
rename to .github/workflows/docs_main.yaml
index 4d852439dc..6c344347aa 100644
--- a/.github/workflows/docs_dev.yaml
+++ b/.github/workflows/docs_main.yaml
@@ -12,6 +12,8 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Set up Python
       uses: actions/setup-python@v2
@@ -23,6 +25,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install -e .[docs]
 
-    - name: Build and deploy
+    - name: Setup doc deploy
+      run: |
+        git config --global user.name "github-actions[bot]"
+        git config --global user.email github-actions[bot]@users.noreply.github.com
+
+    - name: Build and deploy docs to gh-pages
       run: |
-        mike deploy --update-aliases --push --remote origin main latest
+        mike deploy --update-aliases --push --remote origin main development
diff --git a/.github/workflows/docs_release.yaml b/.github/workflows/docs_tags.yaml
similarity index 55%
rename from .github/workflows/docs_release.yaml
rename to .github/workflows/docs_tags.yaml
index 8d6a7afd2b..cad9c44186 100644
--- a/.github/workflows/docs_release.yaml
+++ b/.github/workflows/docs_tags.yaml
@@ -3,7 +3,7 @@ name: Deploy
 on:
   push:
     tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10, v0.1.1a1
 
 jobs:
   deploy:
@@ -12,6 +12,8 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Set up Python
       uses: actions/setup-python@v2
@@ -23,6 +25,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install -e .[docs]
 
-    - name: Build and deploy
+    - name: Setup doc deploy
+      run: |
+        git config --global user.name "github-actions[bot]"
+        git config --global user.email github-actions[bot]@users.noreply.github.com
+
+    - name: Build and deploy docs to gh-pages
       run: |
-        mike deploy --update-aliases --push --remote origin ${{ github.ref }} latest
+        mike deploy --update-aliases --push --remote origin ${{ github.ref_name }} latest