diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 0c35234c..5f754a9a 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,18 @@
+- commits:
+    - subject: Improved mutable (/data) file system detection
+      hash: 204475d3dcbbb8a69b681d0348b39b5b486b628b
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+        Closes: '#1609'
+        closes: '#1609'
+        Signed-off-by: Miguel Casqueira <miguel@balena.io>
+        signed-off-by: Miguel Casqueira <miguel@balena.io>
+      author: Miguel Casqueira
+      nested: []
+  version: 12.5.8
+  date: 2021-04-08T21:37:33.210Z
 - commits:
     - subject: Add message to refer to v2 endpoints
       hash: 732950fb9e106bf0d28d9cbb84c73c80d60e533e
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 192c6aef..eaf6dd1e 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/).
 
+# v12.5.8
+## (2021-04-08)
+
+* Improved mutable (/data) file system detection [Miguel Casqueira]
+
 # v12.5.7
 ## (2021-04-06)
 
diff --git a/VERSION b/VERSION
index e6811145..17dee73b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.7
\ No newline at end of file
+12.5.8
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index da72ba29..c9364cc2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "12.5.7",
+  "version": "12.5.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e69cbb32..ec587b5f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "balena-supervisor",
   "description": "This is balena's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as the balena API informs it to.",
-  "version": "12.5.7",
+  "version": "12.5.8",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",