diff --git a/metadata/com.nextcloud.client.yml b/metadata/com.nextcloud.client.yml
index 88bacf84fd..2b5372f577 100644
--- a/metadata/com.nextcloud.client.yml
+++ b/metadata/com.nextcloud.client.yml
@@ -1724,6 +1724,7 @@ Builds:
 
   - versionName: 3.18.0 RC6
     versionCode: 30180056
+    disable: obsolete RC
     commit: rc-3.18.0-06
     sudo:
       - apt-get update || apt-get update
@@ -1741,11 +1742,30 @@ Builds:
     scandelete:
       - src/androidTest
 
+  - versionName: 3.18.0
+    versionCode: 30180090
+    commit: stable-3.18.0
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - generic
+    rm:
+      - user_manual
+      - gplay.gradle
+    prebuild:
+      - mkdir -p $HOME/.gradle
+      - echo org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
+        > $HOME/.gradle/gradle.properties
+    scandelete:
+      - src/androidTest
+
 MaintainerNotes: 'Latest 3 stable version will be kept, RC versions will be directly
     outdated by either a new RC or by a stable version: 3.3.0 RC1 -> 3.3.0 RC2 ->
     3.3.0 (stable)'
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 3.17.1
-CurrentVersionCode: 30170190
+CurrentVersion: 3.18.0
+CurrentVersionCode: 30180090