diff --git a/.changelog/4366.bugfix.md b/.changelog/4366.bugfix.md
deleted file mode 100644
index 19fd6abda4e..00000000000
--- a/.changelog/4366.bugfix.md
+++ /dev/null
@@ -1,5 +0,0 @@
-oasis-node: Make semver parsing less strict
-
-Semver parsing behavior changed in #4343 was too strict. This hotfix changes
-parsing of versions so that only major component is required whereas minor and
-patch are optional and any remaining components are ignored.
diff --git a/.changelog/4387.bugfix.1.md b/.changelog/4387.bugfix.1.md
deleted file mode 100644
index 97430c259d9..00000000000
--- a/.changelog/4387.bugfix.1.md
+++ /dev/null
@@ -1 +0,0 @@
-go/runtime/client: Take storage into account in GetLastRetainedBlock
diff --git a/.changelog/4387.bugfix.2.md b/.changelog/4387.bugfix.2.md
deleted file mode 100644
index 58ded84899b..00000000000
--- a/.changelog/4387.bugfix.2.md
+++ /dev/null
@@ -1 +0,0 @@
-go/worker/storage: Checkpoint correct round on consensus checkpoint
diff --git a/.changelog/4397.bugfix.md b/.changelog/4397.bugfix.md
deleted file mode 100644
index 8bb4a96150d..00000000000
--- a/.changelog/4397.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-go/storage/client: Catch GetDiff errors early
diff --git a/.changelog/4403.bugfix.md b/.changelog/4403.bugfix.md
deleted file mode 100644
index 776eae55162..00000000000
--- a/.changelog/4403.bugfix.md
+++ /dev/null
@@ -1,7 +0,0 @@
-go/worker/storage: Limit number of rounds to fetch before applying them
-
-Previously, when a node was syncing from genesis, it would try to fetch all
-unapplied rounds before applying them.
-This could mean trying to fetch 100k+ rounds before applying them.
-In combination with failing to fetch rounds and random retrying, this could
-make the syncing process unbearably slow.
diff --git a/.punch_version.py b/.punch_version.py
index 4b09803e7ee..d75d5ec24c5 100644
--- a/.punch_version.py
+++ b/.punch_version.py
@@ -1,3 +1,3 @@
 year = '21'
 minor = 3
-micro = 6
+micro = 7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bebbc39991..60804c67187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,41 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 21.3.7 (2021-12-17)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 4.0.0     |
+| Runtime Host      | 4.0.0     |
+| Runtime Committee | 3.0.0     |
+
+### Bug Fixes
+
+- oasis-node: Make semver parsing less strict
+  ([#4366](https://github.com/oasisprotocol/oasis-core/issues/4366))
+
+  Semver parsing behavior changed in #4343 was too strict. This hotfix changes
+  parsing of versions so that only major component is required whereas minor and
+  patch are optional and any remaining components are ignored.
+
+- go/worker/storage: Checkpoint correct round on consensus checkpoint
+  ([#4387](https://github.com/oasisprotocol/oasis-core/issues/4387))
+
+- go/runtime/client: Take storage into account in GetLastRetainedBlock
+  ([#4387](https://github.com/oasisprotocol/oasis-core/issues/4387))
+
+- go/storage/client: Catch GetDiff errors early
+  ([#4397](https://github.com/oasisprotocol/oasis-core/issues/4397))
+
+- go/worker/storage: Limit number of rounds to fetch before applying them
+  ([#4403](https://github.com/oasisprotocol/oasis-core/issues/4403))
+
+  Previously, when a node was syncing from genesis, it would try to fetch all
+  unapplied rounds before applying them.
+  This could mean trying to fetch 100k+ rounds before applying them.
+  In combination with failing to fetch rounds and random retrying, this could
+  make the syncing process unbearably slow.
+
 ## 21.3.6 (2021-11-15)
 
 | Protocol          | Version   |