diff --git a/RetPageOriginDockerfile b/RetPageOriginDockerfile
index e2e5cb0076..1700393d75 100644
--- a/RetPageOriginDockerfile
+++ b/RetPageOriginDockerfile
@@ -6,10 +6,10 @@ from node:16.16 as builder
 run mkdir -p /hubs/admin/ && cd /hubs
 copy package.json ./
 copy package-lock.json ./
-run npm ci --omit=dev
+run npm ci
 copy admin/package.json admin/
 copy admin/package-lock.json admin/
-run cd admin && npm ci --omit=dev --legacy-peer-deps && cd ..
+run cd admin && npm ci --legacy-peer-deps && cd ..
 copy . .
 env BASE_ASSETS_PATH="{{rawhubs-base-assets-path}}"
 run npm run build 1> /dev/null
diff --git a/admin/package-lock.json b/admin/package-lock.json
index 788709be8c..dcb978fe40 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -78,7 +78,7 @@
         "@fortawesome/fontawesome-svg-core": "^1.2.2",
         "@fortawesome/free-solid-svg-icons": "^5.2.0",
         "@fortawesome/react-fontawesome": "^0.1.0",
-        "@mozilla/lilypad-ui": "^1.8.3",
+        "@mozilla/lilypad-ui": "1.8.6",
         "@mozillareality/easing-functions": "^0.1.1",
         "@popperjs/core": "^2.4.4",
         "aframe": "github:mozillareality/aframe#hubs/master",
@@ -96,13 +96,15 @@
         "detect-browser": "^3.0.1",
         "downshift": "^6.0.5",
         "draft-js": "^0.11.7",
-        "emoji-mart": "^5.5.2",
+        "emoji-picker-react": "^4.4.9",
         "event-target-shim": "^3.0.1",
         "form-data": "^3.0.0",
         "form-urlencoded": "^2.0.4",
         "history": "^4.7.2",
         "hls.js": "^0.14.6",
         "html2canvas": "^1.0.0-rc.7",
+        "hubs-duck-addon": "github:mozillareality/hubs-duck-addon",
+        "hubs-portals-addon": "github:mozillareality/hubs-portals-addon",
         "js-cookie": "^2.2.0",
         "jsonschema": "^1.2.2",
         "jwt-decode": "^2.2.0",
@@ -135,6 +137,7 @@
         "screenfull": "^4.0.1",
         "sdp-transform": "^2.14.1",
         "semver": "^7.3.2",
+        "stream-browserify": "^3.0.0",
         "three": "github:mozillareality/three.js#65b5105908f5f135cad25fed07e25f15f3876777",
         "three-ammo": "github:mozillareality/three-ammo",
         "three-gltf-extensions": "^0.0.14",
@@ -142,6 +145,7 @@
         "three-pathfinding": "^1.1.0",
         "three-to-ammo": "github:infinitelee/three-to-ammo",
         "troika-three-text": "^0.45.0",
+        "url": "^0.11.1",
         "use-clipboard-copy": "^0.2.0",
         "uuid": "^3.2.1",
         "webrtc-adapter": "^7.7.0",
@@ -162,13 +166,12 @@
         "@formatjs/cli": "^5.0.6",
         "@formatjs/cli-lib": "^5.1.0",
         "@iarna/toml": "^2.2.5",
-        "@storybook/addon-actions": "^6.5.9",
-        "@storybook/addon-essentials": "^6.5.9",
-        "@storybook/addon-links": "^6.5.9",
-        "@storybook/builder-webpack5": "^6.5.9",
-        "@storybook/manager-webpack5": "^6.5.9",
-        "@storybook/react": "^6.5.9",
-        "@storybook/storybook-deployer": "^2.8.12",
+        "@storybook/addon-actions": "^7.0.20",
+        "@storybook/addon-essentials": "^7.0.20",
+        "@storybook/addon-links": "^7.0.20",
+        "@storybook/react": "^7.0.20",
+        "@storybook/react-webpack5": "^7.0.20",
+        "@storybook/storybook-deployer": "^2.8.16",
         "@svgr/webpack": "^6.3.1",
         "@types/three": "^0.141.0",
         "@types/webxr": "^0.5.0",
@@ -185,7 +188,7 @@
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "^7.30.1",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-storybook": "^0.6.1",
+        "eslint-plugin-storybook": "^0.6.12",
         "esm": "^3.2.25",
         "fast-plural-rules": "1.0.2",
         "file-loader": "^6.2.0",
@@ -216,6 +219,7 @@
         "selfsigned": "^2.0.1",
         "shelljs": "^0.8.5",
         "spritesheet-js": "github:mozillareality/spritesheet.js#hubs/master",
+        "storybook": "^7.0.20",
         "style-loader": "^3.3.1",
         "stylelint": "^14.9.1",
         "stylelint-config-recommended-scss": "^7.0.0",
@@ -15117,16 +15121,15 @@
         "@fortawesome/free-solid-svg-icons": "^5.2.0",
         "@fortawesome/react-fontawesome": "^0.1.0",
         "@iarna/toml": "^2.2.5",
-        "@mozilla/lilypad-ui": "^1.8.3",
+        "@mozilla/lilypad-ui": "1.8.6",
         "@mozillareality/easing-functions": "^0.1.1",
         "@popperjs/core": "^2.4.4",
-        "@storybook/addon-actions": "^6.5.9",
-        "@storybook/addon-essentials": "^6.5.9",
-        "@storybook/addon-links": "^6.5.9",
-        "@storybook/builder-webpack5": "^6.5.9",
-        "@storybook/manager-webpack5": "^6.5.9",
-        "@storybook/react": "^6.5.9",
-        "@storybook/storybook-deployer": "^2.8.12",
+        "@storybook/addon-actions": "^7.0.20",
+        "@storybook/addon-essentials": "^7.0.20",
+        "@storybook/addon-links": "^7.0.20",
+        "@storybook/react": "^7.0.20",
+        "@storybook/react-webpack5": "^7.0.20",
+        "@storybook/storybook-deployer": "^2.8.16",
         "@svgr/webpack": "^6.3.1",
         "@types/three": "^0.141.0",
         "@types/webxr": "^0.5.0",
@@ -15153,13 +15156,13 @@
         "dotenv": "^16.0.1",
         "downshift": "^6.0.5",
         "draft-js": "^0.11.7",
-        "emoji-mart": "^5.5.2",
+        "emoji-picker-react": "^4.4.9",
         "eslint": "^8.20.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "^7.30.1",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-storybook": "^0.6.1",
+        "eslint-plugin-storybook": "^0.6.12",
         "esm": "^3.2.25",
         "event-target-shim": "^3.0.1",
         "fast-plural-rules": "1.0.2",
@@ -15176,6 +15179,8 @@
         "html-webpack-plugin": "^5.5.0",
         "html2canvas": "^1.0.0-rc.7",
         "htmlhint": "^1.1.4",
+        "hubs-duck-addon": "github:mozillareality/hubs-duck-addon",
+        "hubs-portals-addon": "github:mozillareality/hubs-portals-addon",
         "internal-ip": "^7.0.0",
         "js-cookie": "^2.2.0",
         "jsdom": "^20.0.0",
@@ -15229,6 +15234,8 @@
         "semver": "^7.3.2",
         "shelljs": "^0.8.5",
         "spritesheet-js": "github:mozillareality/spritesheet.js#hubs/master",
+        "storybook": "^7.0.20",
+        "stream-browserify": "^3.0.0",
         "style-loader": "^3.3.1",
         "stylelint": "^14.9.1",
         "stylelint-config-recommended-scss": "^7.0.0",
@@ -15243,6 +15250,7 @@
         "troika-three-text": "^0.45.0",
         "ts-loader": "^9.3.1",
         "typescript": "^4.7.4",
+        "url": "^0.11.1",
         "url-loader": "^4.1.1",
         "use-clipboard-copy": "^0.2.0",
         "uuid": "^3.2.1",
diff --git a/package.json b/package.json
index 1f3a891916..be322f2d7f 100644
--- a/package.json
+++ b/package.json
@@ -102,8 +102,8 @@
     "history": "^4.7.2",
     "hls.js": "^0.14.6",
     "html2canvas": "^1.0.0-rc.7",
-    "hubs-duck-addon": "github:MozillaReality/hubs-duck-addon",
-    "hubs-portals-addon": "github:MozillaReality/hubs-portals-addon",
+    "hubs-duck-addon": "github:mozillareality/hubs-duck-addon",
+    "hubs-portals-addon": "github:mozillareality/hubs-portals-addon",
     "js-cookie": "^2.2.0",
     "jsonschema": "^1.2.2",
     "jwt-decode": "^2.2.0",
@@ -236,4 +236,4 @@
   "optionalDependencies": {
     "fsevents": "^2.2.1"
   }
-}
+}
\ No newline at end of file