diff --git a/.unreleased/nan-vectorized-filters b/.unreleased/nan-vectorized-filters
deleted file mode 100644
index 9059ee99758..00000000000
--- a/.unreleased/nan-vectorized-filters
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #6884 Match the Postgres NaN comparison behavior in WHERE clause over compressed tables.
-Thanks: @jakehedlund for reporting the incompatible NaN behavior in WHERE clause over compressed tables.
diff --git a/.unreleased/pr_7600 b/.unreleased/pr_7600
deleted file mode 100644
index bb3a4008f81..00000000000
--- a/.unreleased/pr_7600
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #7600 Fix lock order when dropping index
diff --git a/.unreleased/pr_7637 b/.unreleased/pr_7637
deleted file mode 100644
index b7ff7f3eb1a..00000000000
--- a/.unreleased/pr_7637
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #7637 Allow EXPLAIN in read-only mode
-Thanks: @ikalafat for reporting a problem with EXPLAIN in read-only mode
diff --git a/.unreleased/pr_7645 b/.unreleased/pr_7645
deleted file mode 100644
index c7dae561dd8..00000000000
--- a/.unreleased/pr_7645
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #7645 Fix DELETE on compressed chunk with non-btree operators
diff --git a/.unreleased/pr_7649 b/.unreleased/pr_7649
deleted file mode 100644
index d9b72419d6b..00000000000
--- a/.unreleased/pr_7649
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #7649 Allow non-btree operator pushdown in UPDATE/DELETE queries on compressed chunks
diff --git a/.unreleased/pr_7653 b/.unreleased/pr_7653
deleted file mode 100644
index 77da7a73b79..00000000000
--- a/.unreleased/pr_7653
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #7653 Push down orderby scankeys to Hypercore TAM
-Thanks: Timescale community members Jacob and pantonis for reporting issues with slow queries.
diff --git a/.unreleased/pr_7656 b/.unreleased/pr_7656
deleted file mode 100644
index d02f8515a3f..00000000000
--- a/.unreleased/pr_7656
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #7656 Remove limitation of compression policy for continuous aggregates
diff --git a/.unreleased/pr_7665 b/.unreleased/pr_7665
deleted file mode 100644
index 97df8120e04..00000000000
--- a/.unreleased/pr_7665
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #7665 Block merging of frozen chunks
diff --git a/.unreleased/pr_7673 b/.unreleased/pr_7673
deleted file mode 100644
index 703d9b92a5e..00000000000
--- a/.unreleased/pr_7673
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #7673 Don't abort additional INSERTs when hitting first conflict
-Thanks: @bjornuppeke for reporting a problem with INSERT INTO ... ON CONFLICT DO NOTHING on compressed chunks
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47502ffdc33..57971609eea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,33 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.18.1 (2025-02-10)
+
+This release contains performance improvements and bug fixes since
+the 2.18.0 release. We recommend that you upgrade at the next
+available opportunity.
+
+**Features**
+* #7656 Remove limitation of compression policy for continuous aggregates
+
+**Bugfixes**
+* #6884 Match the Postgres NaN comparison behavior in WHERE clause over compressed tables.
+* #7600 Fix lock order when dropping index
+* #7637 Allow EXPLAIN in read-only mode
+* #7645 Fix DELETE on compressed chunk with non-btree operators
+* #7649 Allow non-btree operator pushdown in UPDATE/DELETE queries on compressed chunks
+* #7653 Push down orderby scankeys to Hypercore TAM
+* #7665 Block merging of frozen chunks
+* #7673 Don't abort additional INSERTs when hitting first conflict
+
+**GUCs**
+* enable_hypercore_scankey_pushdown: Push down qualifiers as scankeys when using Hypercore TAM
+
+**Thanks**
+* @bjornuppeke for reporting a problem with INSERT INTO ... ON CONFLICT DO NOTHING on compressed chunks
+* @ikalafat for reporting a problem with EXPLAIN in read-only mode
+* @jakehedlund for reporting the incompatible NaN behavior in WHERE clause over compressed tables.
+* Timescale community members Jacob and pantonis for reporting issues with slow queries.
 
 ## 2.18.0 (2025-01-23)
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 7c875848514..075b3e1c228 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -46,11 +46,12 @@ set(MOD_FILES
     updates/2.16.1--2.17.0.sql
     updates/2.17.0--2.17.1.sql
     updates/2.17.1--2.17.2.sql
-    updates/2.17.2--2.18.0.sql)
+    updates/2.17.2--2.18.0.sql
+    updates/2.18.0--2.18.1.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
-set(CURRENT_REV_FILE 2.18.0--2.17.2.sql)
+set(CURRENT_REV_FILE 2.18.1--2.18.0.sql)
 # Files for generating old downgrade scripts. This should only include files for
 # downgrade from one version to its previous version since we do not support
 # skipping versions when downgrading.
@@ -92,7 +93,8 @@ set(OLD_REV_FILES
     2.17.0--2.16.1.sql
     2.17.1--2.17.0.sql
     2.17.2--2.17.1.sql
-    2.18.0--2.17.2.sql)
+    2.18.0--2.17.2.sql
+    2.18.1--2.18.0.sql)
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
 set(LOADER_PATHNAME "$libdir/timescaledb")
diff --git a/sql/updates/2.18.0--2.18.1.sql b/sql/updates/2.18.0--2.18.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sql/updates/2.18.1--2.18.0.sql b/sql/updates/2.18.1--2.18.0.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index a458437f1eb..a18226a460d 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
-version = 2.18.0
-update_from_version = 2.17.2
-downgrade_to_version = 2.17.2
+version = 2.18.1
+update_from_version = 2.18.0
+downgrade_to_version = 2.18.0