diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79a2254c14..78623bcecb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+#### 2.2.1: Release
+
+ - Validate kb and km for `apiMaxLength` (#3603) @Steve-Mcl
+ - Bump vue from 3.4.5 to 3.4.21 (#3524) @app/dependabot
+ - Bump vue-router from 4.2.5 to 4.3.0 (#3557) @app/dependabot
+ - Add apiMaxLength & debugMaxLength settings (#3595) @hardillb
+ - Bump copy-webpack-plugin from 11.0.0 to 12.0.2 (#3594) @app/dependabot
+ - Bump @headlessui/vue from 1.7.16 to 1.7.19 (#3592) @app/dependabot
+ - Bump eslint-plugin-n from 16.2.0 to 16.6.2 (#3593) @app/dependabot
+ - Validate redirect_uri in oauth flow (#3600) @knolleary
+ - Change type param to required while creating a team (#3597) @Jayanth-Parthsarathy
+ - Allow for combined device/instance team limits (#3585) @knolleary
+ - Validate instance property on provisioning token api (#3589) @knolleary
+ - Ensure device agent gets feature flags (#3584) @Steve-Mcl
+ - Bump follow-redirects from 1.15.4 to 1.15.6 (#3587) @app/dependabot
+ - Only show http bearer when licensed (#3583) @hardillb
+ - Docs: Fix broken links in the Device registration docs (#3579) @joepavitt
+
 #### 2.2.0: Release
 
  - HTTP Bearer Tokens test for correct flag (#3573) @hardillb
diff --git a/package-lock.json b/package-lock.json
index cb7ed3ac85..100d2aacdd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@flowfuse/flowfuse",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@flowfuse/flowfuse",
-            "version": "2.2.0",
+            "version": "2.2.1",
             "license": "SEE LICENSE IN ./LICENSE",
             "dependencies": {
                 "@aws-sdk/client-ses": "^3.352.0",
@@ -22,7 +22,7 @@
                 "@fastify/swagger": "^8.10.1",
                 "@fastify/swagger-ui": "^2.1.0",
                 "@fastify/websocket": "^8.1.0",
-                "@flowfuse/driver-localfs": "^2.2.0",
+                "@flowfuse/driver-localfs": "^2.2.1",
                 "@headlessui/vue": "1.7.19",
                 "@heroicons/vue": "1.0.6",
                 "@immobiliarelabs/fastify-sentry": "^8.0.0",
@@ -4206,11 +4206,11 @@
             }
         },
         "node_modules/@flowfuse/driver-localfs": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.2.0.tgz",
-            "integrity": "sha512-KfoJnzO831+R8RNUTnYPhXcX1Qe0exqnZPvZKAWTcKT/+9o8QTnEh6veatQ8dDwzXVcByJwAPJvJKRmH8EAxlQ==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.2.1.tgz",
+            "integrity": "sha512-aFjlqmMr0KfWyfs5x1DPTzSXSrrT3nGUVJ/RXCrLayAtu5yMCQWP9/3/0VfK/hRlSXPknQmRK1+YMCfQpjuM1w==",
             "dependencies": {
-                "@flowfuse/nr-launcher": "^2.2.0",
+                "@flowfuse/nr-launcher": "^2.2.1",
                 "got": "^11.8.5",
                 "semver": "^7.3.8"
             }
@@ -4252,12 +4252,12 @@
             }
         },
         "node_modules/@flowfuse/nr-launcher": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.2.0.tgz",
-            "integrity": "sha512-4hQnAFurQRO7OO7coOfawjcyFhGOW/UvbR55uOigJClljOS9KrXm9ULwziBbXUJ/wVaUMhHceMhc8duo212krg==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.2.1.tgz",
+            "integrity": "sha512-jq/R2/p5ADXycsJHpFrviBeQbPcopiq53KaSclaQSbE3oOczuEBQELczmCdyY72D0XUoMBIoWvX6K2fV6fuL1g==",
             "dependencies": {
                 "@flowfuse/nr-file-nodes": "^0.0.5",
-                "@flowfuse/nr-project-nodes": "^0.6.1",
+                "@flowfuse/nr-project-nodes": "^0.6.2",
                 "@node-red/util": "^3.1.0",
                 "body-parser": "^1.20.2",
                 "command-line-args": "^5.2.1",
@@ -4352,9 +4352,9 @@
             }
         },
         "node_modules/@flowfuse/nr-project-nodes": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-project-nodes/-/nr-project-nodes-0.6.1.tgz",
-            "integrity": "sha512-/lsJwm1MjRnDHQuCCs7WrPZ+3va2vK2SDioQ//CGlEVrAzft6GlkDbsM7X6XsIYQ99CzQDPizB6q8W4XGsbW+g==",
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-project-nodes/-/nr-project-nodes-0.6.2.tgz",
+            "integrity": "sha512-aAwViJiUW40OWy0fvH5xAvxG+WPyWVIgOin54a436xYZIHgvS//DAavAjNS/XLVVAgbP9N2mfV79p1896uiHkg==",
             "dependencies": {
                 "got": "^11.8.6",
                 "mqtt": "^4.3.7"
@@ -26266,11 +26266,11 @@
             }
         },
         "@flowfuse/driver-localfs": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.2.0.tgz",
-            "integrity": "sha512-KfoJnzO831+R8RNUTnYPhXcX1Qe0exqnZPvZKAWTcKT/+9o8QTnEh6veatQ8dDwzXVcByJwAPJvJKRmH8EAxlQ==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.2.1.tgz",
+            "integrity": "sha512-aFjlqmMr0KfWyfs5x1DPTzSXSrrT3nGUVJ/RXCrLayAtu5yMCQWP9/3/0VfK/hRlSXPknQmRK1+YMCfQpjuM1w==",
             "requires": {
-                "@flowfuse/nr-launcher": "^2.2.0",
+                "@flowfuse/nr-launcher": "^2.2.1",
                 "got": "^11.8.5",
                 "semver": "^7.3.8"
             }
@@ -26305,12 +26305,12 @@
             }
         },
         "@flowfuse/nr-launcher": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.2.0.tgz",
-            "integrity": "sha512-4hQnAFurQRO7OO7coOfawjcyFhGOW/UvbR55uOigJClljOS9KrXm9ULwziBbXUJ/wVaUMhHceMhc8duo212krg==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.2.1.tgz",
+            "integrity": "sha512-jq/R2/p5ADXycsJHpFrviBeQbPcopiq53KaSclaQSbE3oOczuEBQELczmCdyY72D0XUoMBIoWvX6K2fV6fuL1g==",
             "requires": {
                 "@flowfuse/nr-file-nodes": "^0.0.5",
-                "@flowfuse/nr-project-nodes": "^0.6.1",
+                "@flowfuse/nr-project-nodes": "^0.6.2",
                 "@node-red/util": "^3.1.0",
                 "body-parser": "^1.20.2",
                 "command-line-args": "^5.2.1",
@@ -26390,9 +26390,9 @@
             }
         },
         "@flowfuse/nr-project-nodes": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-project-nodes/-/nr-project-nodes-0.6.1.tgz",
-            "integrity": "sha512-/lsJwm1MjRnDHQuCCs7WrPZ+3va2vK2SDioQ//CGlEVrAzft6GlkDbsM7X6XsIYQ99CzQDPizB6q8W4XGsbW+g==",
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-project-nodes/-/nr-project-nodes-0.6.2.tgz",
+            "integrity": "sha512-aAwViJiUW40OWy0fvH5xAvxG+WPyWVIgOin54a436xYZIHgvS//DAavAjNS/XLVVAgbP9N2mfV79p1896uiHkg==",
             "requires": {
                 "got": "^11.8.6",
                 "mqtt": "^4.3.7"
diff --git a/package.json b/package.json
index 0b0b8eb5e7..188977a2d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/flowfuse",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "description": "An open source low-code development platform",
     "homepage": "https://flowfuse.com",
     "bugs": {
@@ -66,7 +66,7 @@
         "@fastify/swagger": "^8.10.1",
         "@fastify/swagger-ui": "^2.1.0",
         "@fastify/websocket": "^8.1.0",
-        "@flowfuse/driver-localfs": "^2.2.0",
+        "@flowfuse/driver-localfs": "^2.2.1",
         "@headlessui/vue": "1.7.19",
         "@heroicons/vue": "1.0.6",
         "@immobiliarelabs/fastify-sentry": "^8.0.0",