diff --git a/conf.py b/conf.py
index faedbbd85..2c895dd52 100644
--- a/conf.py
+++ b/conf.py
@@ -36,8 +36,8 @@ html_logo = "../_shared_assets/static/logo-white.png"
 rst_epilog =  '.. |version| replace:: %s' % version
 
 # building the versions list
-version_start = 15		# THIS IS THE SUPPORTED VERSION NUMBER
-version_stable = 17		# INCREASE THIS NUMBER TO THE LATEST STABLE VERSION NUMBER
+version_start = 16		# THIS IS THE SUPPORTED VERSION NUMBER
+version_stable = 18		# INCREASE THIS NUMBER TO THE LATEST STABLE VERSION NUMBER
 def generateVersionsDocs(current_docs):
 	versions_doc = []
 	for v in range(version_start, version_stable + 1):
diff --git a/index.html b/index.html
index 3682fa0f5..667b85c89 100644
--- a/index.html
+++ b/index.html
@@ -221,7 +221,7 @@
 
 							<div class="section" id="nextcloud-18">
 								<h2>Nextcloud 18<a class="headerlink" href="#nextcloud-18" title="Permalink to this headline">¶</a></h2>
-								<p>This documents the <em>upcoming</em> version of Nextcloud.</p>
+								<p>This documents the <em>latest</em> version of Nextcloud.</p>
 								<ul class="simple">
 									<li><a class="reference external" href="https://docs.nextcloud.com/server/18/user_manual/">User Manual</a>
 										(<a class="reference external" href="https://docs.nextcloud.com/server/18/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
@@ -233,7 +233,7 @@
 
 							<div class="section" id="nextcloud-17">
 								<h2>Nextcloud 17<a class="headerlink" href="#nextcloud-17" title="Permalink to this headline">¶</a></h2>
-								<p>This documents the <em>latest</em> version of Nextcloud.</p>
+								<p>This documents a <em>previous</em> version of Nextcloud.</p>
 								<ul class="simple">
 									<li><a class="reference external" href="https://docs.nextcloud.com/server/17/user_manual/">User Manual</a>
 										(<a class="reference external" href="https://docs.nextcloud.com/server/17/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
@@ -255,18 +255,6 @@
 								</ul>
 							</div>
 
-							<div class="section" id="nextcloud-15">
-								<h2>Nextcloud 15<a class="headerlink" href="#nextcloud-15" title="Permalink to this headline">¶</a></h2>
-								<p>This documents a <em>previous</em> version of Nextcloud.</p>
-								<ul class="simple">
-									<li><a class="reference external" href="https://docs.nextcloud.com/server/stable/user_manual/">User Manual</a>
-										(<a class="reference external" href="https://docs.nextcloud.com/server/stable/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
-									<li><a class="reference external" href="https://docs.nextcloud.com/server/stable/admin_manual/">Administration Manual</a>
-										(<a class="reference external" href="https://docs.nextcloud.com/server/stable/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
-									<li><a class="reference external" href="https://docs.nextcloud.com/server/stable/developer_manual/">Developer Manual</a>
-								</ul>
-							</div>
-
 							<div class="section" id="desktop">
 								<h1>Nextcloud Desktop Client<a class="headerlink" href="#desktop" title="Permalink to this headline">¶</a></h1>
 								<p>Once you have a Nextcloud Server running, you can connect to it with various <a class="reference external" href="https://nextcloud.com/install/#install-clients">clients like our mobile and desktop client.</a>
@@ -309,7 +297,19 @@
 								<p>This documents the <em>older</em> versions of Nextcloud. These releases are no longer
 								publicly maintained and users are strongly encouraged to upgrade to a maintained
 								release or get access to long term security and stability updates through a 
-								<a href="https://nextcloud.com/enterprise">Nextcloud Subscription.</a></p>
+								<a href="https://nextcloud.com/enterprise">Nextcloud Subscription.</a></p>a
+
+								<div class="section" id="nextcloud-15">
+									<h2>Nextcloud 15<a class="headerlink" href="#nextcloud-15" title="Permalink to this headline">¶</a></h2>
+									<p>This documents a <em>previous</em> version of Nextcloud.</p>
+									<ul class="simple">
+										<li><a class="reference external" href="https://docs.nextcloud.com/server/stable/user_manual/">User Manual</a>
+											(<a class="reference external" href="https://docs.nextcloud.com/server/stable/Nextcloud_User_Manual.pdf">Download PDF</a>)</li>
+										<li><a class="reference external" href="https://docs.nextcloud.com/server/stable/admin_manual/">Administration Manual</a>
+											(<a class="reference external" href="https://docs.nextcloud.com/server/stable/Nextcloud_Server_Administration_Manual.pdf">Download PDF</a>)</li>
+										<li><a class="reference external" href="https://docs.nextcloud.com/server/stable/developer_manual/">Developer Manual</a>
+									</ul>
+								</div>
 
 								<div class="section" id="nextcloud-14">
 									<h2>Nextcloud 14<a class="headerlink" href="#nextcloud-14" title="Permalink to this headline">¶</a></h2>