diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml
index c2f3d7f99..4ea5a5d1a 100644
--- a/.github/workflows/api-integration-tests.yml
+++ b/.github/workflows/api-integration-tests.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['7.4', '8.0']
-        nextcloud: ['stable21', 'stable22', 'stable23']
+        nextcloud: ['stable22', 'stable23']
         database: ['sqlite', 'pgsql', 'mysql']
         experimental: [false]
         include:
diff --git a/AUTHORS.md b/AUTHORS.md
index a757b8afb..dc816e54a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -126,6 +126,7 @@
 * [Matthias](mailto:matthias.baier@mabaart.de)
 * [Matthias Blümel](mailto:user@inanna.local)
 * [Michael Grosser](mailto:github@stp-ip.net)
+* [Michael Hamann](mailto:michael@content-space.de)
 * [Michael Holley](mailto:michaelwholley@gmail.com)
 * [NanoSector](mailto:rick@nanosector.nl)
 * [Nick Frey](mailto:nickfrey123@gmail.com)
@@ -165,6 +166,7 @@
 * [derritter88](mailto:derritter88@users.noreply.github.com)
 * [e-alfred](mailto:e-alfred@users.noreply.github.com)
 * [fran-penedo](mailto:fran@franpenedo.com)
+* [hansvurst](mailto:45574777+hansvurst-foss@users.noreply.github.com)
 * [joeplus](mailto:joerg@honululu.Speedport_W_723V_1_32_000)
 * [kesselb](mailto:mail@danielkesselberg.de)
 * [kondou](mailto:kondou@ts.unde.re)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8495fa39d..2860aa3d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,9 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
 
 # Unreleased
 
-## [17.x.x]
+## [18.x.x]
 ### Changed
+- Drop support for Nextcloud 21
 
 ### Fixed
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 315a2bcbb..0406abbcb 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
 
 Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
     ]]></description>
-    <version>17.0.1</version>
+    <version>18.0.0</version>
     <licence>agpl</licence>
     <author>Benjamin Brahmer</author>
     <author>Sean Molenaar</author>
@@ -55,7 +55,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
         <lib>json</lib>
 
         <owncloud max-version="0" min-version="0"/>
-        <nextcloud min-version="21" max-version="23"/>
+        <nextcloud min-version="22" max-version="24"/>
     </dependencies>
 
     <background-jobs>
diff --git a/docs/install.md b/docs/install.md
index 3e72bfab6..5ab1dffcb 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -2,8 +2,8 @@
 
 ## Dependencies
 * 64bit OS (starting with News 16.0.0)
-* PHP >= 7.2
-* Nextcloud 20
+* PHP >= 7.3
+* Nextcloud 22
 * libxml >= 2.7.8
 
 You also need some PHP extensions: