diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 9bf4b130..56799e4a 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,36 @@
+- commits:
+    - subject: Split target state set/get into separate module
+      hash: 45d1f1f964e777b5168b089858af0cec33f98c68
+      body: |
+        This removes the circular dependency between device state index and
+        preloading and cleans up the device state module code
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+    - subject: Move device-state.ts into the device-state/index.ts
+      hash: fedeb518e5315a7cb593818c2e80a5d8e459cefa
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+    - subject: Move device-state/target state to api-binder/poll
+      hash: 9497eed380e63f3b5d794071879ad9e8e4369178
+      body: |
+        This goes in the direction of grouping modules by responsibility. The
+        api-binder module is the middleware between the device and the backend,
+        thus the target state polling code makes more sense there.
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+  version: 16.3.13
+  title: ""
+  date: 2024-06-05T20:43:08.205Z
 - commits:
     - subject: Update balena-io/deploy-to-balena-action action to v2.0.70
       hash: d7a325b80a5c79d290b7bb232dabb4a7ac2737f9
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d34dd330..4c0fe424 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/).
 
+# v16.3.13
+## (2024-06-05)
+
+* Split target state set/get into separate module [Felipe Lalanne]
+* Move device-state.ts into the device-state/index.ts [Felipe Lalanne]
+* Move device-state/target state to api-binder/poll [Felipe Lalanne]
+
 # v16.3.12
 ## (2024-06-03)
 
diff --git a/VERSION b/VERSION
index 9ce618f3..7a4eda9c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.3.12
\ No newline at end of file
+16.3.13
\ No newline at end of file
diff --git a/balena.yml b/balena.yml
index 5d4a01ff..4f6ad071 100644
--- a/balena.yml
+++ b/balena.yml
@@ -2,6 +2,6 @@ name: balena-supervisor
 description: 'Balena Supervisor: balena''s agent on devices.'
 joinable: false
 type: sw.application
-version: 16.3.12
+version: 16.3.13
 provides:
   - slug: sw.compose.long-volume-syntax
diff --git a/package-lock.json b/package-lock.json
index 0edfc3f8..510760f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "balena-supervisor",
-  "version": "16.3.12",
+  "version": "16.3.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "balena-supervisor",
-      "version": "16.3.12",
+      "version": "16.3.13",
       "license": "Apache-2.0",
       "dependencies": {
         "@balena/systemd": "^0.5.0",
diff --git a/package.json b/package.json
index 73ae69d9..a59e9d0f 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": "16.3.12",
+  "version": "16.3.13",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -135,6 +135,6 @@
     "yargs": "^17.7.2"
   },
   "versionist": {
-    "publishedAt": "2024-06-03T01:55:57.760Z"
+    "publishedAt": "2024-06-05T20:43:08.743Z"
   }
 }