diff --git a/admin_manual/_templates/versions.html b/admin_manual/_templates/versions.html
index 6c037362d64..d5efa3f05e4 100644
--- a/admin_manual/_templates/versions.html
+++ b/admin_manual/_templates/versions.html
@@ -9,7 +9,7 @@
             data-toggle="rst-current-version"
             aria-expanded="false"
             aria-controls="rst-other-versions-admin">
-      ☁️ {{ current_version }}
+      ☁️ {% if current_version == 'stable' %}{{ version_stable }} (stable){% elif current_version == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ current_version }}{% endif %}
       <span class="fa fa-caret-down" aria-hidden="true"></span>
     </button>
     <div id="rst-other-versions-admin" class="rst-other-versions">
@@ -22,7 +22,7 @@
              style="color: var(--dark-link-color);"
              {% endif %}
           >
-            {{ slug }}
+            {% if slug == 'stable' %}{{ version_stable }} (stable){% elif slug == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ slug }}{% endif %}
           </a>
         </dd>
         {% endfor %}
diff --git a/conf.py b/conf.py
index 7b05a687c30..12dbc0be6d4 100644
--- a/conf.py
+++ b/conf.py
@@ -80,9 +80,9 @@ def setup(app):
 
 def generateVersionsDocs(current_docs):
 	versions_doc = []
-	for v in range(version_start, version_stable + 1):
+	for v in range(version_start, version_stable):
 		url = 'https://docs.nextcloud.com/server/%s/%s' % (str(v), current_docs)
-		versions_doc.append(tuple((v, url)))
+		versions_doc.append(tuple((str(v), url)))
 	versions_doc.append(tuple(('stable', 'https://docs.nextcloud.com/server/%s/%s' % ('stable', current_docs))))
 	versions_doc.append(tuple(('latest', 'https://docs.nextcloud.com/server/%s/%s' % ('latest', current_docs))))
 	return versions_doc
@@ -93,7 +93,8 @@ def generateVersionsDocs(current_docs):
 	github_branch = 'master'
 
 html_context = {
-	'current_version': version,
+	'current_version': release,
+	'version_stable': str(version_stable),
 	'READTHEDOCS': True,
 
 	# force github plugin
diff --git a/developer_manual/_templates/versions.html b/developer_manual/_templates/versions.html
index ea5cd040551..277005def4e 100644
--- a/developer_manual/_templates/versions.html
+++ b/developer_manual/_templates/versions.html
@@ -9,7 +9,7 @@
             data-toggle="rst-current-version"
             aria-expanded="false"
             aria-controls="rst-other-versions-dev">
-      ☁️ {{ current_version }}
+      ☁️ {% if current_version == 'stable' %}{{ version_stable }} (stable){% elif current_version == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ current_version }}{% endif %}
       <span class="fa fa-caret-down" aria-hidden="true"></span>
     </button>
     <div id="rst-other-versions-dev" class="rst-other-versions">
@@ -22,7 +22,7 @@
              style="color: var(--dark-link-color);"
              {% endif %}
           >
-            {{ slug }}
+            {% if slug == 'stable' %}{{ version_stable }} (stable){% elif slug == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ slug }}{% endif %}
           </a>
         </dd>
         {% endfor %}
diff --git a/user_manual/_templates/versions.html b/user_manual/_templates/versions.html
index d5ab32f072c..97ec246987a 100644
--- a/user_manual/_templates/versions.html
+++ b/user_manual/_templates/versions.html
@@ -68,7 +68,7 @@
             aria-controls="rst-other-versions-user">
       🌐 {{ language_names.get(language, language) }}
       <span class="fa fa-caret-down" aria-hidden="true"></span>
-       ☁️ {{ current_version }}
+       ☁️ {% if current_version == 'stable' %}{{ version_stable }} (stable){% elif current_version == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ current_version }}{% endif %}
       <span class="fa fa-caret-down" aria-hidden="true"></span>
     </button>
     <div id="rst-other-versions-user" class="rst-other-versions">
@@ -97,7 +97,7 @@
                style="color: var(--dark-link-color);"
                {% endif %}
             >
-              {{ slug }}
+              {% if slug == 'stable' %}{{ version_stable }} (stable){% elif slug == 'latest' %}{{ version_stable|int + 1 }} (latest){% else %}{{ slug }}{% endif %}
             </a>
           </dd>
         {% endfor %}