diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 3fa4d7c0..6ad2d91e 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,44 @@
+- commits:
+    - subject: Fix gpu label support
+      hash: f009d3a3e99aa174b03b09eca39f9f6b773f0230
+      body: >
+        The device request object was created with untouched fields left unset.
+        When
+
+        comparing state to determine if a transition is required this would
+
+        result in a mismatch between:
+
+            {
+              Driver: '',
+              Count: 1,
+              DeviceIDs: null,
+              Capabilities: [Array],
+              Options: null
+            }
+
+        and
+
+            {
+              Count: 1,
+              Capabilities: [Array],
+            }
+
+        Which in turn resulted in the target service being continously
+        restarted.
+
+        The fix is to instantiate the object in full.
+      footer:
+        Connects-to: ae646a07ec6a6c96f7cb91f1d37898a94dbab47a
+        connects-to: ae646a07ec6a6c96f7cb91f1d37898a94dbab47a
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Robert Günzler <robertg@balena.io>
+        signed-off-by: Robert Günzler <robertg@balena.io>
+      author: Robert Günzler
+      nested: []
+  version: 12.3.6
+  date: 2021-02-09T10:30:32.911Z
 - commits:
     - subject: Prevent inserting null commit during DB migration
       hash: 277d984af20821cd87e3625a1c950555cbca0412
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e97010c..c1ab0367 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.3.6
+## (2021-02-09)
+
+* Fix gpu label support [Robert Günzler]
+
 # v12.3.5
 ## (2021-02-03)
 
diff --git a/VERSION b/VERSION
index 1577656b..94a2a854 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.5
\ No newline at end of file
+12.3.6
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 5b83f882..f1b981f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "12.3.5",
+  "version": "12.3.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b16037d7..a0301800 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.3.5",
+  "version": "12.3.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",