diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1451e09..08e72ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -265,3 +265,12 @@
 [1.17.0]
 * Update base image to 4.2.0
 
+[1.18.0]
+* Update FreshRSS to 1.22.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.22.0)
+* Rework trusted proxies
+* Improve scaling with many feeds and long processes, reduce database locks
+* Fix many bugs and regressions
+* Improve themes Origine (also with automatic dark mode), Nord, etc.
+* Several UI / UX improvements
+* New languages Hungarian, Latvian, Persian
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 533ef35..4784019 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.17.0",
-  "upstreamVersion": "1.21.0",
+  "version": "1.18.0",
+  "upstreamVersion": "1.22.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {