diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 056fba24..f74924aa 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@spree/axios-fetcher": "^1.0.0",
     "@spree/storefront-api-v2-sdk": "6.0.3",
-    "@vue-storefront/core": "^2.5.0"
+    "@vue-storefront/core": "2.5.7"
   },
   "files": [
     "lib/**/*"
diff --git a/packages/composables/package.json b/packages/composables/package.json
index f2235548..0f3ec8d1 100644
--- a/packages/composables/package.json
+++ b/packages/composables/package.json
@@ -13,7 +13,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@vue-storefront/core": "^2.5.0",
+    "@vue-storefront/core": "2.5.7",
     "@vue-storefront/spree-api": "1.4.0",
     "lodash": "^4.17.21"
   },
diff --git a/packages/theme/components/AppFooter.vue b/packages/theme/components/AppFooter.vue
index f6460097..807dd0a9 100644
--- a/packages/theme/components/AppFooter.vue
+++ b/packages/theme/components/AppFooter.vue
@@ -1,5 +1,5 @@
 <template>
-  <SfFooter v-if="!menu.isDisabled" :column="parseInt(menuSize)" multiple class="footer">
+  <SfFooter v-if="menu && !menu.isDisabled" :column="parseInt(menuSize)" multiple class="footer">
     <SfFooterColumn
       v-for="(column, i) in menu && menu.items"
       :key="i"
diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index 82350110..9e5c262f 100644
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -5,11 +5,17 @@ import * as dotenv from 'dotenv';
 
 dotenv.config({ path: `./../../.env.${process.env.NODE_ENV}` });
 
+const serverConfig = {
+  port: process.env.PORT || 3000,
+  host: process.env.HOST || '0.0.0.0',
+  baseUrl: process.env.BASE_URL || 'http://localhost:3000'
+};
+
 export default {
   ssr: true,
   server: {
-    port: process.env.PORT || 3000,
-    host: process.env.HOST || '0.0.0.0'
+    port: serverConfig.port,
+    host: serverConfig.host
   },
   head: {
     title: 'Vue Storefront',
@@ -96,7 +102,7 @@ export default {
       }
     }],
     ['nuxt-i18n', {
-      baseUrl: process.env.BASE_URL || 'http://localhost:3000'
+      baseUrl: serverConfig.baseUrl
     }],
     'cookie-universal-nuxt',
     'vue-scrollto/nuxt',
@@ -189,6 +195,7 @@ export default {
       { code: 'USD', label: 'Dollar' },
       { code: 'EUR', label: 'Euro' }
     ],
-    backendUrl: process.env.BACKEND_URL
+    backendUrl: process.env.BACKEND_URL,
+    middlewareUrl: new URL('/api', serverConfig.baseUrl).href
   }
 };
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 989d2d45..5a073e62 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -16,9 +16,9 @@
     "@nuxtjs/style-resources": "^1.2.1",
     "@storefront-ui/vue": "^0.11.0",
     "@stripe/stripe-js": "^1.20.3",
-    "@vue-storefront/middleware": "^2.5.0",
-    "@vue-storefront/nuxt": "^2.5.0",
-    "@vue-storefront/nuxt-theme": "^2.5.0",
+    "@vue-storefront/middleware": "2.5.7",
+    "@vue-storefront/nuxt": "2.5.7",
+    "@vue-storefront/nuxt-theme": "2.5.7",
     "@vue-storefront/spree": "1.4.0",
     "cookie-universal-nuxt": "^2.1.5",
     "nuxt": "^2.15.8",
diff --git a/packages/theme/pages/Category.vue b/packages/theme/pages/Category.vue
index 299da35b..dcde5fcc 100644
--- a/packages/theme/pages/Category.vue
+++ b/packages/theme/pages/Category.vue
@@ -218,16 +218,11 @@ import { useCart, useWishlist, productGetters, useFacet, facetGetters, useUser,
 import { useUiHelpers, useUiState } from '~/composables';
 import { onSSR } from '@vue-storefront/core';
 import LazyHydrate from 'vue-lazy-hydration';
-import cacheControl from './../helpers/cacheControl';
 import CategoryPageHeader from '~/components/CategoryPageHeader';
 
 // TODO(addToCart qty, horizontal): https://github.com/vuestorefront/storefront-ui/issues/1606
 export default {
   transition: 'fade',
-  middleware: cacheControl({
-    'max-age': 60,
-    'stale-when-revalidate': 5
-  }),
   setup() {
     const th = useUiHelpers();
     const uiState = useUiState();
diff --git a/packages/theme/pages/Home.vue b/packages/theme/pages/Home.vue
index c28ff84a..4fc8b9c4 100644
--- a/packages/theme/pages/Home.vue
+++ b/packages/theme/pages/Home.vue
@@ -155,14 +155,9 @@ import NewsletterModal from '~/components/NewsletterModal.vue';
 import LazyHydrate from 'vue-lazy-hydration';
 import { useUiState } from '../composables';
 import { useContent } from '@vue-storefront/spree';
-import cacheControl from './../helpers/cacheControl';
 
 export default {
   name: 'Home',
-  middleware: cacheControl({
-    'max-age': 60,
-    'stale-when-revalidate': 5
-  }),
   components: {
     InstagramFeed,
     SfHero,
diff --git a/packages/theme/pages/Product.vue b/packages/theme/pages/Product.vue
index 3847b8c8..c7797a48 100644
--- a/packages/theme/pages/Product.vue
+++ b/packages/theme/pages/Product.vue
@@ -138,15 +138,10 @@ import { ref, computed, useRoute, useRouter, useContext } from '@nuxtjs/composit
 import { useProduct, useCart, productGetters } from '@vue-storefront/spree';
 import { onSSR } from '@vue-storefront/core';
 import LazyHydrate from 'vue-lazy-hydration';
-import cacheControl from './../helpers/cacheControl';
 
 export default {
   name: 'Product',
   transition: 'fade',
-  middleware: cacheControl({
-    'max-age': 60,
-    'stale-when-revalidate': 5
-  }),
   setup() {
     const qty = ref(1);
     const route = useRoute();
diff --git a/yarn.lock b/yarn.lock
index fb9094fe..b511565e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3748,10 +3748,10 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
-"@vue-storefront/core@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/core/-/core-2.5.1.tgz#fa7f091ecaed6e5523dae5c54b4b2955b4139cca"
-  integrity sha512-uht8QUS37JQ0+Y9sunZpcrs+kygqTpNJ8W4tqasOFiGy/KHVZcVZku4cOib0eMVHhOsBKrpXK5rg6CH7OE7UOQ==
+"@vue-storefront/core@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/core/-/core-2.5.7.tgz#3c59c95b1693dd8fbf342d452fe57cf9b560dfd0"
+  integrity sha512-OhkzN3FUGD6JCMDvWcdlgOy5I5F7A8MeTIswY9TnY8KdArG25CRNmJA2w45cIqjtohBqUhVZabJVa5ahhGTH7A==
   dependencies:
     axios "0.21.1"
     express "^4.17.1"
@@ -3759,30 +3759,30 @@
     lodash-es "^4.17.15"
     vue "^2.6.11"
 
-"@vue-storefront/middleware@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/middleware/-/middleware-2.5.1.tgz#940a522e1336a42bd34ba3ffcf0f062a216601ee"
-  integrity sha512-wBB5UeXBfjCzisdOhaxVizYogemyMO3gnfP9sdiWOH1frv4KPumcY2Qlc8srP5FX/eroGmgNciTPdFIqzk60qQ==
+"@vue-storefront/middleware@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/middleware/-/middleware-2.5.7.tgz#eabcb6c0a6b89ac1f62163396478adcacc297d0c"
+  integrity sha512-03bpga+7soADMZLCONqq+N1Rbz7a1G/y++ryKXreiQBYedywnpvt0HNjU3Od/DYlnKIJbVniVrd2n1aZ6qVXcA==
   dependencies:
     consola "2.15.3"
     cookie-parser "^1.4.5"
     cors "^2.8.5"
     express "^4.17.1"
 
-"@vue-storefront/nuxt-theme@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt-theme/-/nuxt-theme-2.5.1.tgz#31beec8b177989e90ea876f2ff2fd794979b54e1"
-  integrity sha512-BV2XpYCUBXw24cXyv56qNcGDaQo8jK1+kmnK1bNpTm1kvdVdPENglGBmwOA3iNfMfVMASusnnObx7tc+/2LcTA==
+"@vue-storefront/nuxt-theme@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt-theme/-/nuxt-theme-2.5.7.tgz#7980f4d758cc32db054897886d683f73268d6f21"
+  integrity sha512-YSP3TX3g+xDeTlgrBjFb+kxLcJErcpKimsG29hkLbOFyT/1JAQxfaVNBwWd+axrX/GMAnWZOKpGU51L38rFPSQ==
   dependencies:
     ejs "^3.0.2"
     lodash.debounce "^4.0.8"
     lodash.merge "^4.6.2"
     vue-lazy-hydration "^2.0.0-beta.4"
 
-"@vue-storefront/nuxt@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt/-/nuxt-2.5.1.tgz#01535f9cd251745f97d141bb1fdfde31c95f56b3"
-  integrity sha512-U3jcKSMD49RyxvRFN7B7TFO/nQZG/KnjhXdFi6Cefj0FNpQ2oTAsU7iaz/Swa6OoBtz8OyDq9W/h1NO3Mgcw1w==
+"@vue-storefront/nuxt@2.5.7":
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/@vue-storefront/nuxt/-/nuxt-2.5.7.tgz#0ab898b0d0c321c30cb45f196c1bc552a590d51b"
+  integrity sha512-g+dJ7O0sw4XsybBtqrt+Yp63IZgECSu6RWW5zO+iyJEbDXuSTYWA1O/M7pr6MNYrv/y0HBuSqZvTSgx2wuRA7Q==
   dependencies:
     "@nuxt/typescript-build" "^2.0.0"
     "@nuxtjs/composition-api" "^0.29.3"