diff --git a/app/(cms)/[...cms]/page.tsx b/app/(cms)/[...cms]/page.tsx
index 8afa7edeb..0a89ab4f8 100644
--- a/app/(cms)/[...cms]/page.tsx
+++ b/app/(cms)/[...cms]/page.tsx
@@ -4,7 +4,7 @@ import Prose from 'components/prose';
 import { getPage } from 'lib/shopware';
 import { notFound } from 'next/navigation';
 
-export const runtime = 'nodejs';
+export const runtime = 'edge';
 
 export const revalidate = 43200; // 12 hours in seconds
 
diff --git a/app/api/revalidate/route.ts b/app/api/revalidate/route.ts
index da250294c..94ddfff9b 100644
--- a/app/api/revalidate/route.ts
+++ b/app/api/revalidate/route.ts
@@ -3,7 +3,7 @@ import { revalidateTag } from 'next/cache';
 import { headers } from 'next/headers';
 import { NextRequest, NextResponse } from 'next/server';
 
-export const runtime = 'nodejs';
+export const runtime = 'edge';
 
 // We always need to respond with a 200 status code to Shopify,
 // otherwise it will continue to retry the request.
diff --git a/app/page.tsx b/app/page.tsx
index e1bd0d998..5f357726a 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -3,7 +3,7 @@ import { ThreeItemGrid } from 'components/grid/three-items';
 import Footer from 'components/layout/footer';
 import { Suspense } from 'react';
 
-export const runtime = 'nodejs';
+export const runtime = 'edge';
 
 export const metadata = {
   description: 'High-performance ecommerce store built with Next.js, Vercel, and Shopware.',
diff --git a/app/product/[...handle]/page.tsx b/app/product/[...handle]/page.tsx
index 6f7a76400..573fe475b 100644
--- a/app/product/[...handle]/page.tsx
+++ b/app/product/[...handle]/page.tsx
@@ -13,7 +13,7 @@ import { HIDDEN_PRODUCT_TAG } from 'lib/constants';
 import { getProduct, getProductRecommendations } from 'lib/shopware';
 import { Image } from 'lib/shopware/types';
 
-export const runtime = 'nodejs';
+export const runtime = 'edge';
 
 export async function generateMetadata({
   params
diff --git a/app/search/(collection)/[...collection]/page.tsx b/app/search/(collection)/[...collection]/page.tsx
index c4d1950a5..7de68dae9 100644
--- a/app/search/(collection)/[...collection]/page.tsx
+++ b/app/search/(collection)/[...collection]/page.tsx
@@ -10,7 +10,7 @@ import Pagination from 'components/collection/pagination';
 import { getCollection, getCollectionProducts } from 'lib/shopware';
 import { defaultSort, sorting } from 'lib/constants';
 
-export const runtime = 'nodejs';
+export const runtime = 'edge';
 
 export async function generateMetadata({
   params
diff --git a/app/search/page.tsx b/app/search/page.tsx
index 5200149ec..13b1ac2f2 100644
--- a/app/search/page.tsx
+++ b/app/search/page.tsx
@@ -4,7 +4,7 @@ import FilterList from 'components/layout/search/filter';
 import { defaultSort, sorting } from 'lib/constants';
 import { getSearchCollectionProducts } from 'lib/shopware';
 
-export const runtime = 'nodejs';
+export const runtime = 'edge';
 
 export const metadata = {
   title: 'Search',