diff --git a/.vuestorefrontcloud/docker/Dockerfile b/.vuestorefrontcloud/docker/Dockerfile
index cf8d61f80..843f254a7 100644
--- a/.vuestorefrontcloud/docker/Dockerfile
+++ b/.vuestorefrontcloud/docker/Dockerfile
@@ -72,7 +72,6 @@ RUN yarn install
 RUN npx yarn@1.19.0 workspace @vue-storefront/magento-theme add @sentry/tracing @nuxtjs/sentry @vsf-enterprise/redis-cache
 
 RUN yarn build && yarn cache clean --all
-
 COPY .vuestorefrontcloud/docker/vue-storefront.sh /usr/local/bin/
 
 RUN chmod a+x /usr/local/bin/vue-storefront.sh
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index b6f584122..8e951c408 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -27,7 +27,8 @@
     "@apollo/client": "^3.5.8",
     "graphql": "^16.3.0",
     "graphql-tag": "^2.12.6",
-    "isomorphic-fetch": "^3.0.0"
+    "isomorphic-fetch": "^3.0.0",
+    "dotenv": "^15.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^21.0.1",
@@ -35,7 +36,6 @@
     "@rollup/plugin-json": "^4.1.0",
     "@types/isomorphic-fetch": "^0.0.35",
     "cross-fetch": "^3.1.5",
-    "dotenv": "^15.0.0",
     "graphql-tools": "^8.2.0",
     "jest-transform-graphql": "^2.1.0",
     "msw": "^0.36.8",
diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index 9f073d348..115a15686 100755
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -26,7 +26,7 @@ export default () => {
     ssr: true,
     dev: config.get('nuxtAppEnvironment') !== 'production',
     server: {
-      port: config.get('nuxtAppPort'),
+      port: process.env.PORT || config.get('nuxtAppPort'),
       host: '0.0.0.0',
     },
     head: {
diff --git a/packages/theme/package.json b/packages/theme/package.json
index fbbcb5149..2d8dd2044 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -43,6 +43,7 @@
     "convict-format-with-validator": "^6.2.0",
     "cookie-universal-nuxt": "^2.1.5",
     "deepdash": "^5.3.9",
+    "dotenv": "^16.0.0",
     "isomorphic-dompurify": "^0.18.0",
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.2",
@@ -69,7 +70,6 @@
     "cypress-pipe": "^2.0.0",
     "cypress-tags": "^0.3.0",
     "deepmerge": "^4.2.2",
-    "dotenv": "^15.0.0",
     "ejs": "^3.1.6",
     "jest": "^27.4.7",
     "jest-date-mock": "^1.0.8",
@@ -99,6 +99,6 @@
     "vue": "^2.6.11"
   },
   "engines": {
-    "node": ">=16.x"
+    "node": "^16.13"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c94ab24f4..b4cacab4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8563,6 +8563,11 @@ dotenv@^15.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-15.0.0.tgz#2a585639429bf2c2c62f387f0fffde9c75aafde0"
   integrity sha512-/l1sXXm79ry34KwwS0y4oVZjB468iw/6u9g1W26dtexKcIJAnVL2pMF+hxQwzZ7LutxOwEgtym9eIxvX33CMKg==
 
+dotenv@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.0.tgz#c619001253be89ebb638d027b609c75c26e47411"
+  integrity sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==
+
 dotenv@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
@@ -14049,9 +14054,9 @@ no-case@^3.0.4:
     tslib "^2.0.3"
 
 node-abi@^3.3.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248"
-  integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw==
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32"
+  integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==
   dependencies:
     semver "^7.3.5"