diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 6474819b..2a2111b9 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,118 @@
+- commits:
+    - subject: Update balena-yocto-scripts to 58b4dd401dd6dd27262675b8061c7fddf5a593d4
+      hash: 3b760e26c4954511182d2eea6ce0a80c6fc82805
+      body: Update balena-yocto-scripts
+      footer:
+        Changelog-entry: Update balena-yocto-scripts to 58b4dd401dd6dd27262675b8061c7fddf5a593d4
+        changelog-entry: Update balena-yocto-scripts to 58b4dd401dd6dd27262675b8061c7fddf5a593d4
+      author: balena-renovate[bot]
+      nested:
+        - commits:
+            - subject: Add unique unique identifiers to summary job
+              hash: 625a45b652c332ec5d048caeee7dc25638df8dfb
+              body: |
+                The "All jobs" job is used for branch protection
+                as it captures the overall success/fail of all
+                the test matrices and build.
+
+                However without a unique name we are unable
+                to identify the device type in order to mark it as required.
+
+                This change adds a single instance matrix
+                to the build job and as a result will append the machine
+                name and deploy environment in the job name.
+              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: balena-yocto-scripts-1.25.25
+          title: ""
+          date: 2024-08-23T15:51:41.585Z
+        - commits:
+            - subject: ensure "force-finalize" guarantees a finalized release
+              hash: 08e6722b16af9c6e339fd1862b28d641fdcc5035
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+            - subject: update example workflow to use "deploy-environment" input
+              hash: 044e2122041ba0d7d4a18c2d0cd653b512c42130
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+            - subject: remove "deploy-esr" input
+              hash: 2ea4e3b60c88da21427cf525ed7fed4ab32de6f5
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+            - subject: remove "deploy-s3" input
+              hash: dee1de47e43055e8ef8dd3dc17c8e614e89e835e
+              body: |
+                Instead, always deploy to s3 if we "deploy" anything
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+            - subject: remove "deploy-hostapp" and add "force-finalize" and
+                "finalize-on-push-if-tests-passed"
+              hash: d1de37252ca8d1d1e41d6253abdac602d9999f1d
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+            - subject: rename "envinroment" input to "deploy-environment" for clarity
+              hash: 14e6a1e57faf63f98970254902fd82deb49e586d
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+            - subject: remove os-dev input
+              hash: 8f5bd516abe24758ee129cb835d3b021bb5c3284
+              body: >
+                Removing denabling of development features as we determined it
+                would rarely be used - dev images can just be built locally
+                instead
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Ryan Cooke <ryan@balena.io>
+                signed-off-by: Ryan Cooke <ryan@balena.io>
+              author: rcooke-warwick
+              nested: []
+          version: balena-yocto-scripts-1.25.24
+          title: ""
+          date: 2024-08-21T16:22:42.006Z
+  version: 6.0.12+rev1
+  title: ""
+  date: 2024-08-24T03:28:17.869Z
 - commits:
     - subject: Update layers/meta-balena to a8d6ff62e7ab5bc1f8b1d0a6a8d06d6da84e11af
       hash: 09d1b5ead7b9057d5554bd0c0aa4fc09668a9279
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b854d590..353f1720 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 # v6.0.5
 
+# v6.0.12+rev1
+## (2024-08-24)
+
+
+<details>
+<summary> Update balena-yocto-scripts to 58b4dd401dd6dd27262675b8061c7fddf5a593d4 [balena-renovate[bot]] </summary>
+
+> ## balena-yocto-scripts-1.25.25
+> ### (2024-08-23)
+> 
+> * Add unique unique identifiers to summary job [Kyle Harding]
+> 
+> ## balena-yocto-scripts-1.25.24
+> ### (2024-08-21)
+> 
+> * ensure "force-finalize" guarantees a finalized release [rcooke-warwick]
+> * update example workflow to use "deploy-environment" input [rcooke-warwick]
+> * remove "deploy-esr" input [rcooke-warwick]
+> * remove "deploy-s3" input [rcooke-warwick]
+> * remove "deploy-hostapp" and add "force-finalize" and "finalize-on-push-if-tests-passed" [rcooke-warwick]
+> * rename "envinroment" input to "deploy-environment" for clarity [rcooke-warwick]
+> * remove os-dev input [rcooke-warwick]
+> 
+
+</details>
+
 # v6.0.12
 ## (2024-08-24)
 
diff --git a/VERSION b/VERSION
index d089f6d7..b13d3150 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.12
\ No newline at end of file
+6.0.12+rev1
\ No newline at end of file