diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index cba3079a..9efee512 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,55 @@
+- commits:
+    - subject: Show warning instead of exception for invalid network config
+      hash: 5197a1330d69cbff97f3c53a77f640638e074b8a
+      body: >
+        A previous PR (#1656) fixed validation for network ipam config,
+
+        checking that both network and subnet are defined for each ipam config
+        entry
+
+        (as described in the docker documentation).
+
+
+        After that PR, the validations throws an exception if the network target
+        state is incorrect,
+
+        but this turns out to be the wrong approach, because that exception is
+        also triggered
+
+        when querying target state.
+
+
+        This isn't a problem in normal operation, but it is in local mode,
+        because local
+
+        mode queries the old target state before sending a new one. Since the
+        query fails,
+
+        the CLI can never push the new target state.
+
+
+        This PR replaces the exception with a warning on the logs, since a
+
+        misconfigured network won't cause any engine failures, it will just
+
+        prevent containers to communicate through the provided network.
+
+
+        A future improvement should move this validation to an earlier point in
+        the process,
+
+        so the target state can get rejected before it even gets to a point it
+
+        can be used.
+      footer:
+        Relates-to: '#1693'
+        relates-to: '#1693'
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+  version: 12.6.8
+  date: 2021-05-06T20:30:52.075Z
 - commits:
     - subject: Patch awaiting response when checking if supervisor0 network exists
       hash: 8b0c2347d8d04d3c7101016f6c885f31d9b3dc6a
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9381ddd2..9d1b4036 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.6.8
+## (2021-05-06)
+
+* Show warning instead of exception for invalid network config [Felipe Lalanne]
+
 # v12.6.7
 ## (2021-05-06)
 
diff --git a/VERSION b/VERSION
index 83d13bc7..a6b3d4f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.7
\ No newline at end of file
+12.6.8
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 8b6790bf..99984f27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "12.6.7",
+  "version": "12.6.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 349cce34..6b31bb2f 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.6.7",
+  "version": "12.6.8",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",