diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 9e157e14..06534979 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,22 @@
+- commits:
+    - subject: 'v12 preparations: Add feature switch for default eol-converson'
+      hash: 1569915fae760eb68da00dfa18f48479d5340a96
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+        Connects-to: '#1770'
+        connects-to: '#1770'
+      author: Scott Lowe
+    - subject: 'v12 preparations: Fix dockerignore tests on Windows'
+      hash: b1552f8e9b32abd985fab2c5b36d81dc3dd9e05a
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Paulo Castro
+  version: 11.35.18
+  date: 2020-06-05T15:47:16.860Z
 - commits:
     - subject: Convert 'balena device public-url' commands to oclif
       hash: 728c4f4296f10c838781e74245658a6e391aaba1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a8906d4..a9c1a691 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/).
 
+## 11.35.18 - 2020-06-05
+
+* v12 preparations: Add feature switch for default eol-converson [Scott Lowe]
+* v12 preparations: Fix dockerignore tests on Windows [Paulo Castro]
+
 ## 11.35.17 - 2020-06-02
 
 * Convert 'balena device public-url' commands to oclif [Scott Lowe]
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index df432e39..f4e6b0ad 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "11.35.17",
+  "version": "11.35.18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 89256bac..da7b672d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "11.35.17",
+  "version": "11.35.18",
   "description": "The official balena CLI tool",
   "main": "./build/app.js",
   "homepage": "https://github.com/balena-io/balena-cli",