diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17625f7..c27cbd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+#### 2.31.0: Release
+
+ - Add 4.1.11 to device agent cache (#333)
+ - feat: Add ai.enabled Flag (#326)
+ - Bump docker/metadata-action from 6.0.0 to 6.1.0 (#327)
+ - Bump docker/login-action from 4.1.0 to 4.2.0 (#329)
+ - Bump docker/build-push-action from 7.1.0 to 7.2.0 (#328)
+ - Bump docker/setup-buildx-action from 4.0.0 to 4.1.0 (#330)
+ - ci: enable dependabot cooldown (#324) @ppawlowski
+ - Bump to NodeJS 24 base containers (#323) @hardillb
+
 #### 2.30.1: Release
 
  - Replace NR 4.1.9 with 4.1.10 (#321) @hardillb
diff --git a/docker-compose.yml b/docker-compose.yml
index 89ef149..8539485 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -515,7 +515,7 @@ services:
       - emqx:/opt/emqx/data
 
   forge:
-    image: "flowfuse/forge-docker:2.30.1"
+    image: "flowfuse/forge-docker:2.31.0"
     networks: 
       - flowforge
     restart: always
@@ -542,7 +542,7 @@ services:
       start_period: 10s
 
   file-server:
-    image: "flowfuse/file-server:2.30.1"
+    image: "flowfuse/file-server:2.31.0"
     networks:
       - flowforge
     restart: always
diff --git a/file-server/package.json b/file-server/package.json
index 190e25b..3d2c8fa 100644
--- a/file-server/package.json
+++ b/file-server/package.json
@@ -1,9 +1,9 @@
 {
     "name": "@flowfuse/file-server-container",
-    "version": "2.30.1",
+    "version": "2.31.0",
     "private": true,
     "dependencies": {
-        "@flowfuse/file-server": "^2.30.1"
+        "@flowfuse/file-server": "^2.31.0"
     },
     "license": "Apache-2.0"
 }
diff --git a/flowforge-docker/package.json b/flowforge-docker/package.json
index 0d2171f..5fb423b 100644
--- a/flowforge-docker/package.json
+++ b/flowforge-docker/package.json
@@ -1,14 +1,14 @@
 {
     "name": "@flowfuse/docker-deployment",
     "description": "FlowFuse in Docker",
-    "version": "2.30.1",
+    "version": "2.31.0",
     "private": true,
     "author": {
         "name": "FlowForge Inc."
     },
     "dependencies": {
-        "@flowfuse/flowfuse": "^2.30.1",
-        "@flowfuse/driver-docker": "^2.30.1",
+        "@flowfuse/flowfuse": "^2.31.0",
+        "@flowfuse/driver-docker": "^2.31.0",
         "pg": "^8.7.1",
         "pg-hstore": "^2.3.4"
     },
diff --git a/node-red-container/package.json b/node-red-container/package.json
index 224ccb3..256afe1 100644
--- a/node-red-container/package.json
+++ b/node-red-container/package.json
@@ -1,7 +1,7 @@
 {
     "name": "node-red-project",
     "description": "A Node-RED Project",
-    "version": "2.30.1",
+    "version": "2.31.0",
     "private": true,
     "dependencies": {}
 }