diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index ba56e265..e4ffdab0 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,14 @@
+- commits:
+    - subject: 'ssh: Fix "Found more than one container with a service name <name>"'
+      hash: 7f000ee8c338c88af4a41dee1a2fb924c2c2ee00
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Paulo Castro
+      nested: []
+  version: 12.25.6
+  date: 2020-10-28T01:11:21.452Z
 - commits:
     - subject: Remove need for hardcoded list of command ids
       hash: c48564e85a618af64c5f63722f0039f6e75862ba
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dc5f5e3..80f789c9 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/).
 
+## 12.25.6 - 2020-10-28
+
+* ssh: Fix "Found more than one container with a service name <name>" [Paulo Castro]
+
 ## 12.25.5 - 2020-10-27
 
 * Remove need for hardcoded list of command ids [Scott Lowe]
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 48096be7..4d19ef3a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "12.25.5",
+  "version": "12.25.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9ff78cd3..8eed6f1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "12.25.5",
+  "version": "12.25.6",
   "description": "The official balena Command Line Interface",
   "main": "./build/app.js",
   "homepage": "https://github.com/balena-io/balena-cli",