diff --git a/Dockerfile.template b/Dockerfile.template
index 7212f10..0c70008 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -25,8 +25,6 @@ USER node
 EXPOSE 3000
 ENV NUXT_HOST=0.0.0.0
 ENV NUXT_PORT=3000
-ENV FSXA_HOST=...
-ENV FSXA_PORT=...
 ENV FSXA_API_KEY=...
 ENV FSXA_CAAS=...
 ENV FSXA_PROJECT_ID=...
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 0bb9636..56e6d95 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -25,8 +25,6 @@ const config: NuxtConfig = {
   publicRuntimeConfig: {
     NUXT_HOST: process.env.NUXT_HOST,
     NUXT_PORT: process.env.NUXT_PORT,
-    FSXA_HOST: process.env.FSXA_HOST,
-    FSXA_PORT: process.env.FSXA_PORT,
     FSXA_MODE: process.env.FSXA_MODE,
     FSXA_MAPS_APIKEY: process.env.FSXA_MAPS_APIKEY
   },
@@ -66,8 +64,6 @@ const config: NuxtConfig = {
       {
         NUXT_HOST: process.env.NUXT_HOST,
         NUXT_PORT: process.env.NUXT_PORT,
-        FSXA_HOST: process.env.FSXA_HOST,
-        FSXA_PORT: process.env.FSXA_PORT,
         FSXA_MODE: process.env.FSXA_MODE
       }
     ]
diff --git a/package-lock.json b/package-lock.json
index 5d83cfb..8efaa3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9702,11 +9702,40 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
     "cross-fetch": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
-      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
       "requires": {
-        "node-fetch": "2.6.1"
+        "node-fetch": "2.6.7"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
       }
     },
     "cross-spawn": {
@@ -13386,9 +13415,9 @@
       "optional": true
     },
     "fsxa-api": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fsxa-api/-/fsxa-api-7.0.1.tgz",
-      "integrity": "sha512-yxchhbkaSM03OEobOOWMGBMTnRhAiC9W7ZoHZ8wE5KxN03STXCegIji0QpLqxVn0F6m+/p2diMalvHRyzdnlYA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/fsxa-api/-/fsxa-api-8.0.0.tgz",
+      "integrity": "sha512-2U/nphiMP8dM+RNAFaG5qGtcuMMxmqKfaPf8xV2Oqpu6q7Vx1DW7SJsRA9VCydsuRZoeaF8jMIm7f8urf7/1jg==",
       "requires": {
         "body-parser": "^1.19.0",
         "chalk": "^4.1.2",
@@ -13459,25 +13488,25 @@
       }
     },
     "fsxa-nuxt-module": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/fsxa-nuxt-module/-/fsxa-nuxt-module-4.0.5.tgz",
-      "integrity": "sha512-86agg5/tduB8poHnaI5YNTbQs8GIR+HnlUWt0REuCIEJ4M2j4hy9dWaGCG+C8F36/Qx6a9RBgK4VlTAbR2jfKQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fsxa-nuxt-module/-/fsxa-nuxt-module-5.0.0.tgz",
+      "integrity": "sha512-+tI2LYpUhYv8G9YZL3RVLiB62xi9SKIRtQvY8ttMJLPNYsZU7Gd08fg25aow8nNoPSchpx2TiDz6nxs9J7tHnw==",
       "requires": {
         "cross-fetch": "^3.1.4",
         "express": "^4.17.1",
-        "fsxa-api": "^7.0.1",
-        "fsxa-pattern-library": "^5.1.1",
+        "fsxa-api": "^8.0.0",
+        "fsxa-pattern-library": "^6.0.0",
         "lodash.camelcase": "^4.3.0",
         "lodash.merge": "^4.6.2",
         "lodash.startcase": "^4.4.0"
       }
     },
     "fsxa-pattern-library": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/fsxa-pattern-library/-/fsxa-pattern-library-5.1.1.tgz",
-      "integrity": "sha512-ryea2VnhSSPwBFA7hK8LS8GjXCuUvz0FjRZpWHNwEiE48pyRhRN5DQWhMVyICerNQPt4VBRUzlzrhEqk9JPK4A==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/fsxa-pattern-library/-/fsxa-pattern-library-6.0.0.tgz",
+      "integrity": "sha512-Cyba5gFdVPmyTdm767QJq+FKEOYmhED2xRra129wlczFd14jBIt/Dgm/kZjat9cAs+lnhBauwKndcPsH4hqSLA==",
       "requires": {
-        "fsxa-api": "^7.0.1",
+        "fsxa-api": "^8.0.0",
         "prismjs": "^1.25.0",
         "setimmediate": "^1.0.5",
         "vue": "^2.6.14",
diff --git a/package.json b/package.json
index 8d7d2a1..6a10aea 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@nuxt/core": "^2.15.8",
     "@nuxtjs/axios": "^5.13.6",
-    "fsxa-nuxt-module": "^4.0.5",
+    "fsxa-nuxt-module": "^5.0.0",
     "nuxt-start": "^2.15.8"
   },
   "devDependencies": {
@@ -69,8 +69,8 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-nuxt": ">=2.0.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "fsxa-api": "^7.0.1",
-    "fsxa-pattern-library": "^5.1.1",
+    "fsxa-api": "^8.0.0",
+    "fsxa-pattern-library": "^6.0.0",
     "fsxa-ui": "^4.1.0",
     "husky": "^4.0.0",
     "jest": "^24.1.0",