diff --git a/package.json b/package.json
index b1e126a..cebd280 100644
--- a/package.json
+++ b/package.json
@@ -29,13 +29,13 @@
 		"@eslint/eslintrc": "^3.1.0",
 		"@eslint/js": "^9.12.0",
 		"@fastify/static": "^8.0.1",
-		"@mercuryworkshop/bare-as-module3": "^2.2.2",
+		"@mercuryworkshop/bare-as-module3": "^2.2.3",
 		"@mercuryworkshop/epoxy-transport": "^2.1.17",
 		"@mercuryworkshop/libcurl-transport": "^1.3.10",
 		"@rsdoctor/rspack-plugin": "^0.4.6",
 		"@rspack/cli": "^1.0.10",
 		"@rspack/core": "^1.0.10",
-		"@tomphttp/bare-server-node": "2.0.3",
+		"@nebula-services/bare-server-node": "^2.0.4",
 		"@types/eslint": "^9.6.1",
 		"@types/estree": "^1.0.6",
 		"@types/node": "^22.7.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fbe6a76..85ae3cb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,14 +40,17 @@ importers:
         specifier: ^8.0.1
         version: 8.0.1
       '@mercuryworkshop/bare-as-module3':
-        specifier: ^2.2.2
-        version: 2.2.2
+        specifier: ^2.2.3
+        version: 2.2.3
       '@mercuryworkshop/epoxy-transport':
         specifier: ^2.1.17
         version: 2.1.17
       '@mercuryworkshop/libcurl-transport':
         specifier: ^1.3.10
         version: 1.3.10(typescript@5.6.3)
+      '@nebula-services/bare-server-node':
+        specifier: ^2.0.4
+        version: 2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       '@rsdoctor/rspack-plugin':
         specifier: ^0.4.6
         version: 0.4.6(@rspack/core@1.0.10)(bufferutil@4.0.8)(utf-8-validate@6.0.4)(webpack@5.95.0)
@@ -57,9 +60,6 @@ importers:
       '@rspack/core':
         specifier: ^1.0.10
         version: 1.0.10
-      '@tomphttp/bare-server-node':
-        specifier: 2.0.3
-        version: 2.0.3(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       '@types/eslint':
         specifier: ^9.6.1
         version: 9.6.1
@@ -239,8 +239,8 @@ packages:
     resolution: {integrity: sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==}
     engines: {node: '>=8'}
 
-  '@mercuryworkshop/bare-as-module3@2.2.2':
-    resolution: {integrity: sha512-Ds8981SmI1DQp1mDCVax1x0I5mH2dR1tYKytW7xTjlnpsfwn3RzQDiVJHUCrpc7cWGCe+7mHCF3EoMjM3hFfvQ==}
+  '@mercuryworkshop/bare-as-module3@2.2.3':
+    resolution: {integrity: sha512-JL4hzMpmXUWFdPXlgojfwmbkeXY/IXk+WlJKPXQ/eU5JxJ4pVNO6QG0qMdN+53u8KvdqwUaJvYQY7jaWBrgGhQ==}
 
   '@mercuryworkshop/bare-mux@2.1.2':
     resolution: {integrity: sha512-RKjvM+3Ly2QK5U+AVyMSeJPyaU+xEfjoJDf97XJ9lohs9/JrbfFWeO7Nf65qfL+3WEAjvGzi/oWdN90rWKh1bw==}
@@ -266,6 +266,11 @@ packages:
   '@module-federation/webpack-bundler-runtime@0.5.1':
     resolution: {integrity: sha512-mMhRFH0k2VjwHt3Jol9JkUsmI/4XlrAoBG3E0o7HoyoPYv1UFOWyqAflfANcUPgbYpvqmyLzDcO+3IT36LXnrA==}
 
+  '@nebula-services/bare-server-node@2.0.4':
+    resolution: {integrity: sha512-Jcr+QtkLJVmppdbBarEbRp1TtCsL4pjFIcX6+KPURRqcsOP7hZfYclhjmCserwEC7jT+WBduXpFd3qwqeRBNew==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -473,11 +478,6 @@ packages:
   '@socket.io/component-emitter@3.1.2':
     resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
 
-  '@tomphttp/bare-server-node@2.0.3':
-    resolution: {integrity: sha512-IGzZspDwzto+oPsvlV99OALJKH3X1nRWnpBE8EY6nrqu5I83xw3uSUacEdHNnW4rXG0IQ8vZwMH87VOMoArJ3A==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
-
   '@types/body-parser@1.19.5':
     resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
 
@@ -2732,7 +2732,7 @@ snapshots:
 
   '@lukeed/ms@2.0.2': {}
 
-  '@mercuryworkshop/bare-as-module3@2.2.2':
+  '@mercuryworkshop/bare-as-module3@2.2.3':
     dependencies:
       typescript: 5.6.3
 
@@ -2770,6 +2770,19 @@ snapshots:
       '@module-federation/runtime': 0.5.1
       '@module-federation/sdk': 0.5.1
 
+  '@nebula-services/bare-server-node@2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.4)':
+    dependencies:
+      async-exit-hook: 2.0.1
+      commander: 10.0.1
+      dotenv: 16.4.5
+      http-errors: 2.0.0
+      ipaddr.js: 2.2.0
+      source-map-support: 0.5.21
+      ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -3046,19 +3059,6 @@ snapshots:
 
   '@socket.io/component-emitter@3.1.2': {}
 
-  '@tomphttp/bare-server-node@2.0.3(bufferutil@4.0.8)(utf-8-validate@6.0.4)':
-    dependencies:
-      async-exit-hook: 2.0.1
-      commander: 10.0.1
-      dotenv: 16.4.5
-      http-errors: 2.0.0
-      ipaddr.js: 2.2.0
-      source-map-support: 0.5.21
-      ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-
   '@types/body-parser@1.19.5':
     dependencies:
       '@types/connect': 3.4.38
diff --git a/server.js b/server.js
index 154aa8a..7ede0ed 100644
--- a/server.js
+++ b/server.js
@@ -1,5 +1,5 @@
 // Dev server imports
-import { createBareServer } from "@tomphttp/bare-server-node";
+import { createBareServer } from "@nebula-services/bare-server-node";
 import { createServer } from "http";
 import Fastify from "fastify";
 import fastifyStatic from "@fastify/static";