diff --git a/.eslintignore b/.eslintignore
index 009bf747f63..0168618bd51 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,3 +4,4 @@
 /server/
 /snippets/
 /store/
+/dev-dist/
diff --git a/package-lock.json b/package-lock.json
index 48c983fbdc6..4f6499c8484 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@jamescoyle/vue-icon": "^0.1.2",
         "@kvaster/zwavejs-prom": "^0.0.2",
         "@mdi/js": "7.4.47",
-        "@zwave-js/server": "github:zwave-js/zwave-js-server#zwave-js-13",
+        "@zwave-js/server": "^1.37.0",
         "@zwave-js/winston-daily-rotate-file": "^4.5.6-1",
         "ansi_up": "^6.0.2",
         "archiver": "^7.0.1",
@@ -58,7 +58,7 @@
         "vuedraggable": "^2.24.3",
         "vuetify": "^2.7.2",
         "winston": "^3.13.0",
-        "zwave-js": "^13.0.0-beta.6"
+        "zwave-js": "^13.0.0"
       },
       "bin": {
         "zwave-js-ui": "server/bin/www.js"
@@ -2611,14 +2611,14 @@
       }
     },
     "node_modules/@homebridge/ciao": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.2.0.tgz",
-      "integrity": "sha512-2Qa8MVC7Q5DKH6iXh6cRvqz9VJYVpVZ+whHKrnr8YdPkXxc67kiQ9IOxMb0ydokDTETBVyXgr1m+HrheBtqDoQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.3.0.tgz",
+      "integrity": "sha512-PRbY5FiukY13gIDwiAAZng598gMyI61GL9VU19G2CB4D3vNwh8vESgI9TkjeecCDethTqJmNiruYvdunfQkt7w==",
       "dependencies": {
-        "debug": "^4.3.4",
+        "debug": "^4.3.5",
         "fast-deep-equal": "^3.1.3",
         "source-map-support": "^0.5.21",
-        "tslib": "^2.6.2"
+        "tslib": "^2.6.3"
       },
       "bin": {
         "ciao-bcs": "lib/bonjour-conformance-testing.js"
@@ -4729,14 +4729,14 @@
       }
     },
     "node_modules/@zwave-js/cc": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/cc/-/cc-13.0.0-beta.6.tgz",
-      "integrity": "sha512-lAXrcnieIdExJgmGjjSah+aehKxRQn7tIibdRuQ3uxe8p44Hq++Y/GZedpKKH5oetYH+jar226zixxm6Qaa7Dg==",
-      "dependencies": {
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/host": "13.0.0-beta.6",
-        "@zwave-js/serial": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/cc/-/cc-13.0.0.tgz",
+      "integrity": "sha512-hzwILQiGIGXf/EGzPEIBTLKy4Qo6V8VWoCltjIPn7q+u2xm5BCUgSAAGoxt4OOKZTtxVGQLzUH0ozZkHRxyELg==",
+      "dependencies": {
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/host": "13.0.0",
+        "@zwave-js/serial": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "ansi-colors": "^4.1.3",
         "reflect-metadata": "^0.2.2"
@@ -4749,12 +4749,12 @@
       }
     },
     "node_modules/@zwave-js/config": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-13.0.0-beta.6.tgz",
-      "integrity": "sha512-T4lkIkXV95jgfKECkblzmBmukQYVobvSA1kzhh2sEdz30JK4HJ4P2ZC46a/Fncg1rqg7JHhMgWL2AIxo4pz6/Q==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-13.0.0.tgz",
+      "integrity": "sha512-CK6ToQ8d4MsDVOZEyDCrHKnTC4Mi/tsh4GnAJEJ7L8D5CBLg1Gin+aPyQ73Kg88mTybHALhuRrbKVeudEKEhoQ==",
       "dependencies": {
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "ansi-colors": "^4.1.3",
         "fs-extra": "^11.2.0",
@@ -4771,12 +4771,12 @@
       }
     },
     "node_modules/@zwave-js/core": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-13.0.0-beta.6.tgz",
-      "integrity": "sha512-W76NEbuw7tgcUVaS4a6eYR2tnU4WCHY7ANJDG79BZ4xcSvjVAvNGquYRcoTu1gMKAjQOfQLrViLnKojYQhIt5w==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-13.0.0.tgz",
+      "integrity": "sha512-2oHupNKOnYkswU81kI/Arz+hgq4XoKWd/s0lscO5y7ZX22n+lN2S6VG1abAhI7DllB1zw1F6bsexkmXfSiLPPA==",
       "dependencies": {
         "@alcalzone/jsonl-db": "^3.1.1",
-        "@zwave-js/shared": "13.0.0-beta.1",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "ansi-colors": "^4.1.3",
         "dayjs": "^1.11.10",
@@ -4804,13 +4804,13 @@
       }
     },
     "node_modules/@zwave-js/host": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/host/-/host-13.0.0-beta.6.tgz",
-      "integrity": "sha512-tmpKJxbV6SNxlLWfOmC6ey19rvw7JKs3LY6PV1WrompuwoHvU5cvVNVdfA09+n1UwJUqz9I6315BWsNSiuPZ4A==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/host/-/host-13.0.0.tgz",
+      "integrity": "sha512-sw1sontWNSk5PXnfzFbszLB8h3TQHGhQWPE5AYX2BOFJ1NLx0P1+9tdH4vcH+zjj1CfBbsxAuxmopisWqBgYiA==",
       "dependencies": {
-        "@zwave-js/config": "13.0.0-beta.6",
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
+        "@zwave-js/config": "13.0.0",
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8"
       },
       "engines": {
@@ -4821,12 +4821,12 @@
       }
     },
     "node_modules/@zwave-js/nvmedit": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-13.0.0-beta.6.tgz",
-      "integrity": "sha512-AKXrhvOm+buKDMXT4Ig98VgH6RcZwjF0F/pQsQO+63GGZuA/ycBL4B2PoxXn6d5k3NOiAIPMzi4dc3fR6Signw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-13.0.0.tgz",
+      "integrity": "sha512-+kH1PTZZbPQ6WT5fHt2gddDAlHBqCubE8cQO/bqfKVhH/w7/mwiod5GInVoBx0OjuvRBbrScmUnd2XhYgeoMZQ==",
       "dependencies": {
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "fs-extra": "^11.2.0",
         "reflect-metadata": "^0.2.2",
@@ -4938,14 +4938,14 @@
       }
     },
     "node_modules/@zwave-js/serial": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-13.0.0-beta.6.tgz",
-      "integrity": "sha512-QkHRxauVl90rKxTSiLtILJdoDvqhMPSaiXqr581zIbpzRS8tDC/RRDIyqYdfZQK8TFgxzR2HfsI72WO0K1GdZQ==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-13.0.0.tgz",
+      "integrity": "sha512-fbOfHxtS73o/Zdy4IbU3xemVI9nxWmWkwUZi07bRb3zDi1Qej0ZhpcotMpOEcTCxN+WpBpKNxCNKaSUvWsbMvQ==",
       "dependencies": {
         "@serialport/stream": "^12.0.0",
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/host": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/host": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "serialport": "^12.0.0",
         "winston": "^3.13.0"
@@ -4958,8 +4958,9 @@
       }
     },
     "node_modules/@zwave-js/server": {
-      "version": "1.36.0",
-      "resolved": "git+ssh://git@github.com/zwave-js/zwave-js-server.git#1719062c9d3433704d9c95817bcfded57e24b54b",
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/server/-/server-1.37.0.tgz",
+      "integrity": "sha512-TXR2SrLJ0PxhPtyMXwaJHJ22RxjsxL2co4sA60BotPgEZXzjWOkZZog/3wilVepXY4Rz+gXRbHb4F/WPfjk6mQ==",
       "dependencies": {
         "@homebridge/ciao": "^1.1.7",
         "minimist": "^1.2.8",
@@ -4970,13 +4971,13 @@
         "zwave-server": "dist/bin/server.js"
       },
       "peerDependencies": {
-        "zwave-js": "^13.0.0-beta.1"
+        "zwave-js": "^13.0.0"
       }
     },
     "node_modules/@zwave-js/shared": {
-      "version": "13.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@zwave-js/shared/-/shared-13.0.0-beta.1.tgz",
-      "integrity": "sha512-L3GNJVQsIU9CoVLwHAa9NTC7v2obaKF/62Q1v0TQ20DlFLfeN9tf6hK+Wl5n2Nn13Cb67cg/xiIy1qIuFLAg/A==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/shared/-/shared-13.0.0.tgz",
+      "integrity": "sha512-Lwhrdm02Gv2kMrDkIqf74zOF6wctp/77FTDKStmHR0OA6o+kdrne8bMm9Z3Lw8etclaoCVRaJM5K0Ot4XWR/oA==",
       "dependencies": {
         "alcalzone-shared": "^4.0.8",
         "fs-extra": "^11.2.0"
@@ -4989,14 +4990,14 @@
       }
     },
     "node_modules/@zwave-js/testing": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@zwave-js/testing/-/testing-13.0.0-beta.6.tgz",
-      "integrity": "sha512-YWpEaQKhRxrc6+At1daYMH8nc29CMpC+3OGMCTcFhedkd7/Vvojj7fODQtDZLIrjEUHuQyc0l5LONTHNpxvXZQ==",
-      "dependencies": {
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/host": "13.0.0-beta.6",
-        "@zwave-js/serial": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@zwave-js/testing/-/testing-13.0.0.tgz",
+      "integrity": "sha512-7yB9UX2dY7lBy456L+JhiwcZXKu8gzses4kZqnpQtwQ5dd33yxBJleDGjMJ7+LabhN3nR3GqIpxTQDiPhGYBbg==",
+      "dependencies": {
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/host": "13.0.0",
+        "@zwave-js/serial": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "ansi-colors": "^4.1.3"
       },
@@ -20507,21 +20508,21 @@
       }
     },
     "node_modules/zwave-js": {
-      "version": "13.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-13.0.0-beta.6.tgz",
-      "integrity": "sha512-ZFkAsbNDu/wEeot8kCr/4BTX1r6pQm1n0TJfxOo6ycnseJkDrhb+aHE7T6aou6oxOLAavL1dP/QZiEdl/m8A9g==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-13.0.0.tgz",
+      "integrity": "sha512-8q7o63C8AhwL7oWTZ+x3XiDa1Dod2TOA74THXOblCgXFMIUMYhPY0Xe181CINMgz9B67M5KCIMKVTft8rzj8fQ==",
       "dependencies": {
         "@alcalzone/jsonl-db": "^3.1.1",
         "@alcalzone/pak": "^0.11.0",
         "@homebridge/ciao": "^1.2.0",
-        "@zwave-js/cc": "13.0.0-beta.6",
-        "@zwave-js/config": "13.0.0-beta.6",
-        "@zwave-js/core": "13.0.0-beta.6",
-        "@zwave-js/host": "13.0.0-beta.6",
-        "@zwave-js/nvmedit": "13.0.0-beta.6",
-        "@zwave-js/serial": "13.0.0-beta.6",
-        "@zwave-js/shared": "13.0.0-beta.1",
-        "@zwave-js/testing": "13.0.0-beta.6",
+        "@zwave-js/cc": "13.0.0",
+        "@zwave-js/config": "13.0.0",
+        "@zwave-js/core": "13.0.0",
+        "@zwave-js/host": "13.0.0",
+        "@zwave-js/nvmedit": "13.0.0",
+        "@zwave-js/serial": "13.0.0",
+        "@zwave-js/shared": "13.0.0",
+        "@zwave-js/testing": "13.0.0",
         "alcalzone-shared": "^4.0.8",
         "ansi-colors": "^4.1.3",
         "execa": "^5.1.1",
diff --git a/package.json b/package.json
index 6241b77055f..113ba6db96d 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "@jamescoyle/vue-icon": "^0.1.2",
     "@kvaster/zwavejs-prom": "^0.0.2",
     "@mdi/js": "7.4.47",
-    "@zwave-js/server": "github:zwave-js/zwave-js-server#zwave-js-13",
+    "@zwave-js/server": "^1.37.0",
     "@zwave-js/winston-daily-rotate-file": "^4.5.6-1",
     "ansi_up": "^6.0.2",
     "archiver": "^7.0.1",
@@ -110,7 +110,7 @@
     "vuedraggable": "^2.24.3",
     "vuetify": "^2.7.2",
     "winston": "^3.13.0",
-    "zwave-js": "^13.0.0-beta.6"
+    "zwave-js": "^13.0.0"
   },
   "devDependencies": {
     "@actions/github": "^6.0.0",