diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba3885bc3684f..d4fc47992394f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,20 +79,6 @@ jobs:
           # regardless of having code changes or not
           fetch-depth: 1
 
-      - name: Restore Build Cache
-        uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
-        with:
-          path: |
-            .turbo/cache
-            .next/cache
-            node_modules/.cache
-          # We want to restore cache from local .npm caches, .next/cache and node_modules/.cache
-          # As this should reduce build times, and the overall time for installing packages or running operations
-          key: cache-build-${{ hashFiles('package-lock.json') }}-
-          restore-keys: |
-            cache-build-${{ hashFiles('package-lock.json') }}-
-            cache-build-
-
       - name: Set up Node.js
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
@@ -132,20 +118,3 @@ jobs:
           # this should be a last resort in case by any chances the build memory gets too high
           # but in general this should never happen
           NODE_OPTIONS: '--max_old_space_size=4096'
-
-      - name: Save Build Cache
-        # We want to store the Build Cache within Pull Requests or during pushes against the `main` branch
-        # since caches created on the `main` (default) branch can be reused on Pull Requests and PRs coming from forks
-        if: |
-          github.event_name == 'push' || github.event_name == 'pull_request_target'
-        uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
-        with:
-          path: |
-            .turbo/cache
-            .next/cache
-            node_modules/.cache
-          # Most of sibling Pull Requests will use the cache key based on the package-lock.json
-          # We do also add a hashFiles for `.next/cache` as GitHub Actions only allows
-          # One cache with same key to exist, so to ensure we always have a cache from the latest build
-          # We add the hashFiles of `.next/cache` to the cache key of the Cache Entry
-          key: cache-build-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.next/cache/**') }}
diff --git a/app/layout.tsx b/app/[locale]/layout.tsx
similarity index 100%
rename from app/layout.tsx
rename to app/[locale]/layout.tsx
diff --git a/app/[locale]/not-found.tsx b/app/[locale]/not-found.tsx
index c0a4758a0e9b1..34c2edd6288f8 100644
--- a/app/[locale]/not-found.tsx
+++ b/app/[locale]/not-found.tsx
@@ -1,3 +1,15 @@
-import NotFound from '@/app/not-found';
+import { useTranslations } from 'next-intl';
+import type { FC } from 'react';
 
-export default NotFound;
+const LocalizedNotFound: FC = () => {
+  const t = useTranslations();
+
+  return (
+    <div className="container">
+      <h2>{t('pages.404.title')}</h2>
+      <h3>{t('pages.404.description')}</h3>
+    </div>
+  );
+};
+
+export default LocalizedNotFound;
diff --git a/app/not-found.tsx b/app/not-found.tsx
deleted file mode 100644
index d59a8cf140a16..0000000000000
--- a/app/not-found.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useTranslations } from 'next-intl';
-import type { FC } from 'react';
-
-const NotFound: FC = () => {
-  const t = useTranslations();
-
-  return (
-    <div className="container">
-      <h2>{t('pages.404.title')}</h2>
-      <h3>{t('pages.404.description')}</h3>
-    </div>
-  );
-};
-
-// This is a fallback Not Found Page that in theory should never be requested
-export const dynamic = 'force-dynamic';
-
-export default NotFound;