diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index f65c70a58025..2ea856f0f248 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -58,6 +58,13 @@ jobs:
           name: ${{ matrix.qgis_version }}
           path: ./build/
 
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.event_name != 'pull_request' && matrix.qgis_version != 'master' }}
+        with:
+          tag_name: ${{ env.QGIS_VERSION }}
+          files: ./build/${{ env.QGIS_VERSION }}
+
   publish-docs:
     if: ${{ github.event_name != 'pull_request' }}
     name: Publish HTML
diff --git a/conf.py.in b/conf.py.in
index d95cb3e67e4f..a952b7e7091c 100644
--- a/conf.py.in
+++ b/conf.py.in
@@ -36,9 +36,9 @@ copyright = u'2018, QGIS project'
 # built documents.
 #
 # The short X.Y version.
-version = '__QGISVERSION__'
+version = '__QGIS_VERSION__'
 # The full version, including alpha/beta/rc tags.
-release = '__QGISVERSION__'
+release = '__QGIS_VERSION__'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -183,7 +183,7 @@ htmlhelp_basename = 'QGISAPIDOC'
 
 rst_prolog = """
 .. role:: disclaimer
-.. |updatedisclaimer| replace:: :disclaimer:`Docs for 'QGIS __QGISVERSION__'`
+.. |updatedisclaimer| replace:: :disclaimer:`Docs for 'QGIS __QGIS_VERSION__'`
 """
 
 # Substitutions icons below are sorted