diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 7d7f6b90f..c1f18d8e7 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,28 @@
+- commits:
+    - subject: Combine test and cache metadata to prevent empty cache-from values
+      hash: 3509ad9ed149d91e0278f91122f5b04ae3b27283
+      body: >
+        These two steps were largely redundant anyway, and the latter was only
+
+        used to populate a list of possible image cache sources as fallback if
+        gha
+
+        doesn't have a current cache.
+
+
+        Rather than run two metadata steps, just run it once with all possible
+
+        image tag combinations.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Kyle Harding <kyle@balena.io>
+        signed-off-by: Kyle Harding <kyle@balena.io>
+      author: Kyle Harding
+      nested: []
+  version: 19.9.16
+  title: ""
+  date: 2025-02-10T18:43:19.178Z
 - commits:
     - subject: Update dependency node to v20.18.3
       hash: 2d633f451b66c4d00887bfe0bf9604378d1b1946
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fab9cc991..823fe8ae6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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/).
 
+## 19.9.16 - 2025-02-10
+
+* Combine test and cache metadata to prevent empty cache-from values [Kyle Harding]
+
 ## 19.9.15 - 2025-02-10
 
 * Update dependency node to v20.18.3 [balena-renovate[bot]]
diff --git a/package-lock.json b/package-lock.json
index 7441e9679..f640f27ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "flowzone",
-  "version": "19.9.15",
+  "version": "19.9.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flowzone",
-      "version": "19.9.15",
+      "version": "19.9.16",
       "dependencies": {
         "yaml": "^2.1.3"
       },
diff --git a/package.json b/package.json
index f713d1e6a..e5fa6a7fb 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
   "dependencies": {
     "yaml": "^2.1.3"
   },
-  "version": "19.9.15",
+  "version": "19.9.16",
   "versionist": {
-    "publishedAt": "2025-02-10T15:11:04.976Z"
+    "publishedAt": "2025-02-10T18:43:19.730Z"
   }
 }