diff --git a/apps/dev-env/package.json b/apps/dev-env/package.json
index 740d9e2f6..bfeedb1cc 100644
--- a/apps/dev-env/package.json
+++ b/apps/dev-env/package.json
@@ -40,7 +40,7 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.46.1",
     "rimraf": "^5.0.1",
-    "storybook": "^8.6.15",
+    "storybook": "^8.6.17",
     "typescript": "^5.5.4",
     "uuid": "^9.0.0",
     "vite": "^5.4.19"
diff --git a/apps/doc-site/package.json b/apps/doc-site/package.json
index b31b6d8fe..1ee5ad335 100644
--- a/apps/doc-site/package.json
+++ b/apps/doc-site/package.json
@@ -31,7 +31,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.1",
-    "storybook": "^8.6.15",
+    "storybook": "^8.6.17",
     "typescript": "^5.5.4",
     "vite": "^5.4.19"
   },
diff --git a/package-lock.json b/package-lock.json
index 5b6887cf1..dcf03439c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,12 +58,90 @@
         "react-dom": "^18.2.0",
         "react-hook-form": "^7.46.1",
         "rimraf": "^5.0.1",
-        "storybook": "^8.6.15",
+        "storybook": "^8.6.17",
         "typescript": "^5.5.4",
         "uuid": "^9.0.0",
         "vite": "^5.4.19"
       }
     },
+    "apps/dev-env/node_modules/@storybook/core": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.17.tgz",
+      "integrity": "sha512-lndZDYIvUddWk54HmgYwE4h2B0JtWt8ztIRAzHRt6ReZZ9QQbmM5b85Qpa+ng4dyQEKc2JAtYD3Du7RRFcpHlw==",
+      "dependencies": {
+        "@storybook/theming": "8.6.17",
+        "better-opn": "^3.0.2",
+        "browser-assert": "^1.2.1",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
+        "esbuild-register": "^3.5.0",
+        "jsdoc-type-pratt-parser": "^4.0.0",
+        "process": "^0.11.10",
+        "recast": "^0.23.5",
+        "semver": "^7.6.2",
+        "util": "^0.12.5",
+        "ws": "^8.2.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
+    "apps/dev-env/node_modules/@storybook/theming": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.17.tgz",
+      "integrity": "sha512-IttFvRqozpuzN5MlQEWGOzUA2rZg86688Dyv1d+bjpYcFHtY1X4XyTCGwv1BPTaTsB959oM8R2yoNYWQkABbBA==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+      }
+    },
+    "apps/dev-env/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "apps/dev-env/node_modules/storybook": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.17.tgz",
+      "integrity": "sha512-krR/l680A6qVnkGiK9p8jY0ucX3+kFCs2f4zw+S3w2Cdq8EiM/tFebPcX2V4S3z2UsO0v0dwAJOJNpzbFPdmVg==",
+      "dependencies": {
+        "@storybook/core": "8.6.17"
+      },
+      "bin": {
+        "getstorybook": "bin/index.cjs",
+        "sb": "bin/index.cjs",
+        "storybook": "bin/index.cjs"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
     "apps/doc-site": {
       "name": "@iot-app-kit/doc-site",
       "version": "12.5.1",
@@ -90,11 +168,93 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "rimraf": "^5.0.1",
-        "storybook": "^8.6.15",
+        "storybook": "^8.6.17",
         "typescript": "^5.5.4",
         "vite": "^5.4.19"
       }
     },
+    "apps/doc-site/node_modules/@storybook/core": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.17.tgz",
+      "integrity": "sha512-lndZDYIvUddWk54HmgYwE4h2B0JtWt8ztIRAzHRt6ReZZ9QQbmM5b85Qpa+ng4dyQEKc2JAtYD3Du7RRFcpHlw==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/theming": "8.6.17",
+        "better-opn": "^3.0.2",
+        "browser-assert": "^1.2.1",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
+        "esbuild-register": "^3.5.0",
+        "jsdoc-type-pratt-parser": "^4.0.0",
+        "process": "^0.11.10",
+        "recast": "^0.23.5",
+        "semver": "^7.6.2",
+        "util": "^0.12.5",
+        "ws": "^8.2.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
+    "apps/doc-site/node_modules/@storybook/theming": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.17.tgz",
+      "integrity": "sha512-IttFvRqozpuzN5MlQEWGOzUA2rZg86688Dyv1d+bjpYcFHtY1X4XyTCGwv1BPTaTsB959oM8R2yoNYWQkABbBA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+      }
+    },
+    "apps/doc-site/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "apps/doc-site/node_modules/storybook": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.17.tgz",
+      "integrity": "sha512-krR/l680A6qVnkGiK9p8jY0ucX3+kFCs2f4zw+S3w2Cdq8EiM/tFebPcX2V4S3z2UsO0v0dwAJOJNpzbFPdmVg==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/core": "8.6.17"
+      },
+      "bin": {
+        "getstorybook": "bin/index.cjs",
+        "sb": "bin/index.cjs",
+        "storybook": "bin/index.cjs"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
     "configuration/eslint-config": {
       "name": "eslint-config-iot-app-kit",
       "version": "12.5.1",
@@ -14042,36 +14202,6 @@
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@storybook/core": {
-      "version": "8.6.15",
-      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.15.tgz",
-      "integrity": "sha512-VFpKcphNurJpSC4fpUfKL3GTXVoL53oytghGR30QIw5jKWwaT50HVbTyb41BLOUuZjmMhUQA8weiQEew6RX0gw==",
-      "dependencies": {
-        "@storybook/theming": "8.6.15",
-        "better-opn": "^3.0.2",
-        "browser-assert": "^1.2.1",
-        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
-        "esbuild-register": "^3.5.0",
-        "jsdoc-type-pratt-parser": "^4.0.0",
-        "process": "^0.11.10",
-        "recast": "^0.23.5",
-        "semver": "^7.6.2",
-        "util": "^0.12.5",
-        "ws": "^8.2.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "prettier": "^2 || ^3"
-      },
-      "peerDependenciesMeta": {
-        "prettier": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@storybook/core-events": {
       "version": "7.6.20",
       "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.6.20.tgz",
@@ -14086,29 +14216,6 @@
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core/node_modules/@storybook/theming": {
-      "version": "8.6.15",
-      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.15.tgz",
-      "integrity": "sha512-dAbL0XOekyT6XsF49R6Etj3WxQ/LpdJDIswUUeHgVJ6/yd2opZOGbPxnwA3zlmAh1c0tvpPyhSDXxSG79u8e4Q==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@storybook/csf": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.11.tgz",
@@ -32313,31 +32420,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/storybook": {
-      "version": "8.6.15",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.15.tgz",
-      "integrity": "sha512-Ob7DMlwWx8s7dMvcQ3xPc02TvUeralb+xX3oaPRk9wY9Hc6M1IBC/7cEoITkSmRS2v38DHubC+mtEKNc1u2gQg==",
-      "dependencies": {
-        "@storybook/core": "8.6.15"
-      },
-      "bin": {
-        "getstorybook": "bin/index.cjs",
-        "sb": "bin/index.cjs",
-        "storybook": "bin/index.cjs"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "prettier": "^2 || ^3"
-      },
-      "peerDependenciesMeta": {
-        "prettier": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/storybook-dark-mode": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/storybook-dark-mode/-/storybook-dark-mode-3.0.3.tgz",
@@ -37097,7 +37179,7 @@
         "react-dom": "^18.2.0",
         "react-intl": "^6.8.7",
         "rimraf": "^5.0.1",
-        "storybook": "^8.6.15",
+        "storybook": "^8.6.17",
         "storybook-dark-mode": "^3.0.0",
         "tsconfig-paths-webpack-plugin": "^4.1.0",
         "type-fest": "^4.28.1",
@@ -37113,6 +37195,50 @@
         "react-dom": "^18"
       }
     },
+    "packages/react-components/node_modules/@storybook/core": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.17.tgz",
+      "integrity": "sha512-lndZDYIvUddWk54HmgYwE4h2B0JtWt8ztIRAzHRt6ReZZ9QQbmM5b85Qpa+ng4dyQEKc2JAtYD3Du7RRFcpHlw==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/theming": "8.6.17",
+        "better-opn": "^3.0.2",
+        "browser-assert": "^1.2.1",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
+        "esbuild-register": "^3.5.0",
+        "jsdoc-type-pratt-parser": "^4.0.0",
+        "process": "^0.11.10",
+        "recast": "^0.23.5",
+        "semver": "^7.6.2",
+        "util": "^0.12.5",
+        "ws": "^8.2.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
+    "packages/react-components/node_modules/@storybook/theming": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.17.tgz",
+      "integrity": "sha512-IttFvRqozpuzN5MlQEWGOzUA2rZg86688Dyv1d+bjpYcFHtY1X4XyTCGwv1BPTaTsB959oM8R2yoNYWQkABbBA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+      }
+    },
     "packages/react-components/node_modules/aria-query": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
@@ -37225,6 +37351,44 @@
         "node": "*"
       }
     },
+    "packages/react-components/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "packages/react-components/node_modules/storybook": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.17.tgz",
+      "integrity": "sha512-krR/l680A6qVnkGiK9p8jY0ucX3+kFCs2f4zw+S3w2Cdq8EiM/tFebPcX2V4S3z2UsO0v0dwAJOJNpzbFPdmVg==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/core": "8.6.17"
+      },
+      "bin": {
+        "getstorybook": "bin/index.cjs",
+        "sb": "bin/index.cjs",
+        "storybook": "bin/index.cjs"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
     "packages/react-components/node_modules/type-fest": {
       "version": "4.28.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.28.1.tgz",
@@ -37378,7 +37542,7 @@
         "rimraf": "^5.0.1",
         "sass": "^1.63.4",
         "sass-loader": "^13.3.2",
-        "storybook": "^8.6.15",
+        "storybook": "^8.6.17",
         "svglint": "^2.4.0",
         "ts-patch": "^2.1.0",
         "ts-transform-react-intl": "^0.4.1",
@@ -38262,6 +38426,50 @@
         "node": ">=16.0.0"
       }
     },
+    "packages/scene-composer/node_modules/@storybook/core": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.17.tgz",
+      "integrity": "sha512-lndZDYIvUddWk54HmgYwE4h2B0JtWt8ztIRAzHRt6ReZZ9QQbmM5b85Qpa+ng4dyQEKc2JAtYD3Du7RRFcpHlw==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/theming": "8.6.17",
+        "better-opn": "^3.0.2",
+        "browser-assert": "^1.2.1",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
+        "esbuild-register": "^3.5.0",
+        "jsdoc-type-pratt-parser": "^4.0.0",
+        "process": "^0.11.10",
+        "recast": "^0.23.5",
+        "semver": "^7.6.2",
+        "util": "^0.12.5",
+        "ws": "^8.2.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
+    "packages/scene-composer/node_modules/@storybook/theming": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.17.tgz",
+      "integrity": "sha512-IttFvRqozpuzN5MlQEWGOzUA2rZg86688Dyv1d+bjpYcFHtY1X4XyTCGwv1BPTaTsB959oM8R2yoNYWQkABbBA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+      }
+    },
     "packages/scene-composer/node_modules/@tanstack/react-query": {
       "version": "4.36.1",
       "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.36.1.tgz",
@@ -38896,6 +39104,44 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "packages/scene-composer/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "packages/scene-composer/node_modules/storybook": {
+      "version": "8.6.17",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.17.tgz",
+      "integrity": "sha512-krR/l680A6qVnkGiK9p8jY0ucX3+kFCs2f4zw+S3w2Cdq8EiM/tFebPcX2V4S3z2UsO0v0dwAJOJNpzbFPdmVg==",
+      "dev": true,
+      "dependencies": {
+        "@storybook/core": "8.6.17"
+      },
+      "bin": {
+        "getstorybook": "bin/index.cjs",
+        "sb": "bin/index.cjs",
+        "storybook": "bin/index.cjs"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
     "packages/scene-composer/node_modules/style-to-object": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.4.tgz",
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
index be20c7fd1..9e507b054 100644
--- a/packages/react-components/package.json
+++ b/packages/react-components/package.json
@@ -101,7 +101,7 @@
     "react-dom": "^18.2.0",
     "react-intl": "^6.8.7",
     "rimraf": "^5.0.1",
-    "storybook": "^8.6.15",
+    "storybook": "^8.6.17",
     "storybook-dark-mode": "^3.0.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "type-fest": "^4.28.1",
diff --git a/packages/scene-composer/package.json b/packages/scene-composer/package.json
index 6a0aa5789..62ed276f3 100644
--- a/packages/scene-composer/package.json
+++ b/packages/scene-composer/package.json
@@ -139,7 +139,7 @@
     "rimraf": "^5.0.1",
     "sass": "^1.63.4",
     "sass-loader": "^13.3.2",
-    "storybook": "^8.6.15",
+    "storybook": "^8.6.17",
     "svglint": "^2.4.0",
     "ts-patch": "^2.1.0",
     "ts-transform-react-intl": "^0.4.1",