diff --git a/admin_manual/_templates/versions.html b/admin_manual/_templates/versions.html
new file mode 100644
index 000000000..70c5e22de
--- /dev/null
+++ b/admin_manual/_templates/versions.html
@@ -0,0 +1,25 @@
+{% if READTHEDOCS %}
+{# Add rst-badge after rst-versions for small badge style. #}
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      ☁️ {{ current_version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>☁️ {{ _('Versions') }}</dt>
+        {% for slug, url in versions|reverse %}
+        <dd style="width: 32%">
+          <a href="{{ url }}"
+             {% if current_version == slug %}
+             style="color: var(--dark-link-color);"
+             {% endif %}
+          >
+            {{ slug }}
+          </a>
+        </dd>
+        {% endfor %}
+      </dl>
+    </div>
+  </div>
+{% endif %}
\ No newline at end of file
diff --git a/admin_manual/conf.py b/admin_manual/conf.py
index 1a469042a..f84811b75 100644
--- a/admin_manual/conf.py
+++ b/admin_manual/conf.py
@@ -32,7 +32,7 @@ from conf import *
 extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['../_shared_assets/templates']
+templates_path = ['../_shared_assets/templates', '_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -61,6 +61,8 @@ project = u'Nextcloud %s Administration Manual' % (version)
 # for a list of supported languages.
 #language = None
 
+language = 'en'
+
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
 #today = ''
diff --git a/conf.py b/conf.py
index f4467bde3..341f2f461 100644
--- a/conf.py
+++ b/conf.py
@@ -8,6 +8,8 @@ dir_path = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, os.path.abspath(dir_path + '/_ext'))
 now = datetime.datetime.now()
 
+os.environ["READTHEDOCS"] = "True"
+
 extensions = ['sphinx_rtd_theme', 'sphinx_rtd_dark_mode', 'sphinx_copybutton']
 
 # General information about the project.
diff --git a/developer_manual/_templates/versions.html b/developer_manual/_templates/versions.html
new file mode 100644
index 000000000..70c5e22de
--- /dev/null
+++ b/developer_manual/_templates/versions.html
@@ -0,0 +1,25 @@
+{% if READTHEDOCS %}
+{# Add rst-badge after rst-versions for small badge style. #}
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      ☁️ {{ current_version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>☁️ {{ _('Versions') }}</dt>
+        {% for slug, url in versions|reverse %}
+        <dd style="width: 32%">
+          <a href="{{ url }}"
+             {% if current_version == slug %}
+             style="color: var(--dark-link-color);"
+             {% endif %}
+          >
+            {{ slug }}
+          </a>
+        </dd>
+        {% endfor %}
+      </dl>
+    </div>
+  </div>
+{% endif %}
\ No newline at end of file
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
index a0fa8cfb0..a02e9f850 100644
--- a/developer_manual/conf.py
+++ b/developer_manual/conf.py
@@ -32,7 +32,7 @@ from conf import *
 extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx', 'sphinxcontrib.phpdomain', 'sphinx_toolbox.collapse', 'sphinx_reredirects']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['../_shared_assets/templates']
+templates_path = ['../_shared_assets/templates', '_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -60,6 +60,8 @@ project = u'Nextcloud %s Developer Manual' % (version)
 # for a list of supported languages.
 #language = None
 
+language = 'en'
+
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
 #today = ''