diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml
index e2c20908e..ecaf3e5ff 100644
--- a/.github/workflows/build-docs.yaml
+++ b/.github/workflows/build-docs.yaml
@@ -91,6 +91,14 @@ jobs:
           repository: ${{ vars.GITHUB_REPOSITORY }}
           fetch-depth: 0
 
+      - name: Track all branches
+        shell: bash
+        run: |
+          git config --global --add safe.directory /__w/AtomVM/AtomVM
+          for branch in `git branch -a | grep "remotes/origin" | grep -v HEAD | grep -v  "${{ github.ref_name }}"`; do
+            git branch --track ${branch#remotes/origin/} $branch
+          done
+
       - name: Build Site
         shell: bash
         run: |
diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
index ff8e52f9e..cde1c5242 100644
--- a/.github/workflows/publish-docs.yaml
+++ b/.github/workflows/publish-docs.yaml
@@ -98,6 +98,14 @@ jobs:
           ref: Production
           path: /home/runner/work/AtomVM/AtomVM/www
 
+      - name: Track all branches
+        shell: bash
+        run: |
+          git config --global --add safe.directory /__w/AtomVM/AtomVM
+          for branch in `git branch -a | grep "remotes/origin" | grep -v HEAD | grep -v "${{ github.ref_name }}" `; do
+            git branch --track ${branch#remotes/origin/} $branch
+          done
+
       - name: Build Site
         shell: bash
         run: |
diff --git a/doc/conf.py.in b/doc/conf.py.in
index d6cdce215..52c6550a5 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -171,7 +171,7 @@ for tag in tag_list:
     versions.append(tag.name)
     release_list.append(tag.name)
 
-omit_branch_list = ('release-0.5')
+omit_branch_list = [ 'release-0.5' ]
 branch_list = sorted(repo.branches, key=lambda t: t.commit.committed_datetime)
 for branch in branch_list:
     if branch.name not in omit_branch_list: