diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dcef99..5c1dad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@ All notable changes to [camunda-bpmn-js](https://github.com/camunda/camunda-bpmn
 
 ___Note:__ Yet to be released changes appear here._
 
+## 5.4.2
+
+* `DEPS`: update to `bpmn-js@18.1.2`
+* `DEPS`: update to `diagram-js@15.2.4`
+
+### Key Changes in Modeling
+
+* `FIX`: canvas `autoFocus` must explicitly be enabled ([bpmn-io/diagram-js#956](https://github.com/bpmn-io/diagram-js/pull/956))
+* `FIX`: properly integrate `zoomscroll` with canvas focus ([bpmn-io/diagram-js#956](https://github.com/bpmn-io/diagram-js/pull/956))
+* `FIX`: properly integrate `movecanvas` with canvas focus ([bpmn-io/diagram-js#956](https://github.com/bpmn-io/diagram-js/pull/956))
+
 ## 5.4.1
 
 * `DEPS`: update to `@bpmn-io/variable-resolver@1.3.2`
diff --git a/package-lock.json b/package-lock.json
index eaa8449..f2f7889 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,14 +16,14 @@
         "@bpmn-io/properties-panel": "^3.25.1",
         "@bpmn-io/variable-resolver": "^1.3.2",
         "@camunda/example-data-properties-provider": "^1.2.1",
-        "bpmn-js": "^18.1.1",
+        "bpmn-js": "^18.1.2",
         "bpmn-js-color-picker": "^0.7.1",
         "bpmn-js-create-append-anything": "^0.5.2",
         "bpmn-js-element-templates": "^2.4.0",
         "bpmn-js-executable-fix": "^0.2.1",
         "camunda-bpmn-js-behaviors": "^1.9.0",
         "camunda-bpmn-moddle": "^7.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-grid": "^1.1.0",
         "diagram-js-minimap": "^5.2.0",
         "diagram-js-origin": "^1.4.0",
@@ -3196,13 +3196,13 @@
       }
     },
     "node_modules/bpmn-js": {
-      "version": "18.1.1",
-      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.1.tgz",
-      "integrity": "sha512-7LN+f7y1u4FtbI/6lI3Elf2phEBa0RVr0YJZrSG46RyiHU9wY5NR2n9OIqKeuGJq1RJ/YMowMoUNDIBdmb9zbg==",
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.2.tgz",
+      "integrity": "sha512-GtD/Zyu5foh+S74/PNNBs0ys1yiQb6LSuQjbUIzsCssNkbI/3IJH9k7y7AdRrZFoci+oFSeCRTwSCldZSPMpKw==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "bpmn-moddle": "^9.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-direct-editing": "^3.2.0",
         "ids": "^1.0.5",
         "inherits-browser": "^0.1.0",
@@ -4447,9 +4447,9 @@
       "dev": true
     },
     "node_modules/diagram-js": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.3.tgz",
-      "integrity": "sha512-C7MM5D7D0x6F5KsPzGmIPL/O9VoglTFSGrDnQNiFIA0SldC6WCwx/0nG9nS4Pwjtf7QeccaozF7FD1NAMHFs5Q==",
+      "version": "15.2.4",
+      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.4.tgz",
+      "integrity": "sha512-8v0U8AY6a5Vd6Cys5MdN7+yYRhs294/Q4ixkER/3v2ZPSbVCnK9XfbeYbB5QQfoCMkBnY7WBbLbcjvRNHTxnpw==",
       "license": "MIT",
       "dependencies": {
         "@bpmn-io/diagram-js-ui": "^0.2.3",
@@ -16828,12 +16828,12 @@
       }
     },
     "bpmn-js": {
-      "version": "18.1.1",
-      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.1.tgz",
-      "integrity": "sha512-7LN+f7y1u4FtbI/6lI3Elf2phEBa0RVr0YJZrSG46RyiHU9wY5NR2n9OIqKeuGJq1RJ/YMowMoUNDIBdmb9zbg==",
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.1.2.tgz",
+      "integrity": "sha512-GtD/Zyu5foh+S74/PNNBs0ys1yiQb6LSuQjbUIzsCssNkbI/3IJH9k7y7AdRrZFoci+oFSeCRTwSCldZSPMpKw==",
       "requires": {
         "bpmn-moddle": "^9.0.1",
-        "diagram-js": "^15.2.3",
+        "diagram-js": "^15.2.4",
         "diagram-js-direct-editing": "^3.2.0",
         "ids": "^1.0.5",
         "inherits-browser": "^0.1.0",
@@ -17699,9 +17699,9 @@
       "dev": true
     },
     "diagram-js": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.3.tgz",
-      "integrity": "sha512-C7MM5D7D0x6F5KsPzGmIPL/O9VoglTFSGrDnQNiFIA0SldC6WCwx/0nG9nS4Pwjtf7QeccaozF7FD1NAMHFs5Q==",
+      "version": "15.2.4",
+      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.4.tgz",
+      "integrity": "sha512-8v0U8AY6a5Vd6Cys5MdN7+yYRhs294/Q4ixkER/3v2ZPSbVCnK9XfbeYbB5QQfoCMkBnY7WBbLbcjvRNHTxnpw==",
       "requires": {
         "@bpmn-io/diagram-js-ui": "^0.2.3",
         "clsx": "^2.1.0",
diff --git a/package.json b/package.json
index 019c560..575db42 100644
--- a/package.json
+++ b/package.json
@@ -59,14 +59,14 @@
     "@bpmn-io/properties-panel": "^3.25.1",
     "@bpmn-io/variable-resolver": "^1.3.2",
     "@camunda/example-data-properties-provider": "^1.2.1",
-    "bpmn-js": "^18.1.1",
+    "bpmn-js": "^18.1.2",
     "bpmn-js-color-picker": "^0.7.1",
     "bpmn-js-create-append-anything": "^0.5.2",
     "bpmn-js-element-templates": "^2.4.0",
     "bpmn-js-executable-fix": "^0.2.1",
     "camunda-bpmn-js-behaviors": "^1.9.0",
     "camunda-bpmn-moddle": "^7.0.1",
-    "diagram-js": "^15.2.3",
+    "diagram-js": "^15.2.4",
     "diagram-js-grid": "^1.1.0",
     "diagram-js-minimap": "^5.2.0",
     "diagram-js-origin": "^1.4.0",