diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 8393655d0..83ef754fc 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,26 @@
+- commits:
+    - subject: "balena-lib: improve base tag detection"
+      hash: 872bb3b1df920b026b524e041bf4f4f7c422cb2f
+      body: |
+        When a ESR release is deployed a tag with the base meta-balena version
+        is created. This is used by the API to check for a valid OS version
+        for updates.
+
+        The current mechanism to find the base version only provides an ESR
+        version for the first commit after the branch has been created.
+
+        Using merge-base to find the common ancestor and `tag --points-at` to
+        find the actual tag works for all commits after the branch is created.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Alex Gonzalez <alexg@balena.io>
+        signed-off-by: Alex Gonzalez <alexg@balena.io>
+      author: Alex Gonzalez
+      nested: []
+  version: 1.21.9
+  title: ""
+  date: 2024-04-30T14:17:29.958Z
 - commits:
     - subject: Support commit tags when extracting version tag from git
       hash: 98fec51fae4721224e64cfec52480a5f17b8e271
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba4a866e2..b52a585a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v1.21.9
+## (2024-04-30)
+
+* balena-lib: improve base tag detection [Alex Gonzalez]
+
 # v1.21.8
 ## (2024-04-29)
 
diff --git a/VERSION b/VERSION
index 5c9a6fe71..3434b8fa9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.21.8
\ No newline at end of file
+1.21.9
\ No newline at end of file