diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 00f11a6e..afc2f460 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,51 @@
+- commits:
+    - subject: Ensure we get input on parsing errors
+      hash: 645bc6c185b804df0e6d2088c5239eabcfa4ce80
+      body: >
+        We wrap JSON and date parsing code to ensure input data is logged in
+        case of an error.
+      footer:
+        Change-type: minor
+        change-type: minor
+        Signed-off-by: Roman Mazur <roman@balena.io>
+        signed-off-by: Roman Mazur <roman@balena.io>
+      author: Roman Mazur
+    - subject: Ensure local mode switch runs before target state
+      hash: 7c4d8d765348425559115b0b8bf08903bef84f52
+      body: >
+        This change makes DeviceState to wait until local mode switch is
+        definitely
+
+        completed before actually applying the state, which avoids races in
+        state cleanup.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Roman Mazur <roman@balena.io>
+        signed-off-by: Roman Mazur <roman@balena.io>
+      author: Roman Mazur
+    - subject: Clean up local mode engine objects using snapshots
+      hash: 4974c9200c3955d40bfb0348d8972eb9c6dba02d
+      body: >
+        Snapshot is collected to compare with engine state when local mode is
+        turned off.
+      footer:
+        Change-type: minor
+        change-type: minor
+        Signed-off-by: Roman Mazur <roman@balena.io>
+        signed-off-by: Roman Mazur <roman@balena.io>
+      author: Roman Mazur
+    - subject: Add sinon types
+      hash: bc3c56da4e86941e4c143f066fb4e179ae21ba6b
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Roman Mazur <roman@balena.io>
+        signed-off-by: Roman Mazur <roman@balena.io>
+      author: Roman Mazur
+  version: 9.18.0
+  date: 2019-06-26T15:01:34.535Z
 - commits:
     - subject: Change to https for cloning resinos-in-container submodule
       hash: 81b0d3142ec7209f75f5b6b009d295b95bb920a4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1988e4d8..90913876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ 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/).
 
+## 9.18.0 - 2019-06-26
+
+* Ensure we get input on parsing errors [Roman Mazur]
+* Ensure local mode switch runs before target state [Roman Mazur]
+* Clean up local mode engine objects using snapshots [Roman Mazur]
+* Add sinon types [Roman Mazur]
+
 ## 9.17.2 - 2019-06-25
 
 * Change to https for cloning resinos-in-container submodule [Pagan Gazzard]
diff --git a/package-lock.json b/package-lock.json
index a14d027f..dfc89ac4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "9.17.2",
+  "version": "9.18.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 23203692..62353b2b 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": "9.17.2",
+  "version": "9.18.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",