diff --git a/app/build.gradle b/app/build.gradle
index 2fcb2c6f..8f7cea49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
-        versionCode 477
-        versionName "3.17.0"
+        versionCode 478
+        versionName "3.18.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index a78bdeaf..6cb378a8 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.18.0",
+    "code": "478",
+    "note": "Added:\n- Support camel case tags (automatically recorded when composing)\n- Manage tags when composing (top right menu)\n- Custom tabs (default: enabled)\n\nChanged:\n- Media heights now use the screen size\n- Remove horizontal scroll for media\n- Reduce size of emoji when text size is increased\n- Update available languages in picker\n\nFixed:\n- Forwarded tags are added back after being deleted\n- TalkBack issues\n- Some crashes"
+  },
   {
     "version": "3.17.0",
     "code": "477",
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/478.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/478.txt
index f866e7fe..ae962fc4 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/478.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/478.txt
@@ -5,6 +5,7 @@ Added:
 
 Changed:
 - Media heights now use the screen size
+- Remove horizontal scroll for media
 - Reduce size of emoji when text size is increased
 - Update available languages in picker