diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 208ef42..d0dd593 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ marketplace_tests:
   image: node:20-bookworm
   before_script:
     - npm ci
+    - npm run build --workspace @rentaldrivego/types
   script:
     - npm run test:marketplace
   rules:
diff --git a/apps/admin/next-env.d.ts b/apps/admin/next-env.d.ts
index 9edff1c..4f11a03 100644
--- a/apps/admin/next-env.d.ts
+++ b/apps/admin/next-env.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/apps/admin/tsconfig.json b/apps/admin/tsconfig.json
index b575f7d..5d606a9 100644
--- a/apps/admin/tsconfig.json
+++ b/apps/admin/tsconfig.json
@@ -15,7 +15,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "react-jsx",
+    "jsx": "preserve",
     "incremental": true,
     "plugins": [
       {
diff --git a/apps/dashboard/next-env.d.ts b/apps/dashboard/next-env.d.ts
index 9edff1c..4f11a03 100644
--- a/apps/dashboard/next-env.d.ts
+++ b/apps/dashboard/next-env.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/apps/dashboard/tsconfig.json b/apps/dashboard/tsconfig.json
index b575f7d..5d606a9 100644
--- a/apps/dashboard/tsconfig.json
+++ b/apps/dashboard/tsconfig.json
@@ -15,7 +15,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "react-jsx",
+    "jsx": "preserve",
     "incremental": true,
     "plugins": [
       {
diff --git a/apps/marketplace/next-env.d.ts b/apps/marketplace/next-env.d.ts
index 9edff1c..4f11a03 100644
--- a/apps/marketplace/next-env.d.ts
+++ b/apps/marketplace/next-env.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/apps/marketplace/src/app/(public)/app-privacy-ar/page.tsx b/apps/marketplace/src/app/(public)/app-privacy-ar/page.tsx
index 40784fe..76b8cce 100644
--- a/apps/marketplace/src/app/(public)/app-privacy-ar/page.tsx
+++ b/apps/marketplace/src/app/(public)/app-privacy-ar/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import FooterContentPage from '@/components/FooterContentPage'
 
 export default function AppPrivacyArPage() {
diff --git a/apps/marketplace/src/app/(public)/app-privacy-en/page.tsx b/apps/marketplace/src/app/(public)/app-privacy-en/page.tsx
index 11a1dc8..202d028 100644
--- a/apps/marketplace/src/app/(public)/app-privacy-en/page.tsx
+++ b/apps/marketplace/src/app/(public)/app-privacy-en/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import FooterContentPage from '@/components/FooterContentPage'
 
 export default function AppPrivacyEnPage() {
diff --git a/apps/marketplace/src/app/(public)/app-privacy-fr/page.tsx b/apps/marketplace/src/app/(public)/app-privacy-fr/page.tsx
index 081bb9d..59d917a 100644
--- a/apps/marketplace/src/app/(public)/app-privacy-fr/page.tsx
+++ b/apps/marketplace/src/app/(public)/app-privacy-fr/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import FooterContentPage from '@/components/FooterContentPage'
 
 export default function AppPrivacyFrPage() {
diff --git a/apps/marketplace/src/app/(public)/app-tc-ar/page.tsx b/apps/marketplace/src/app/(public)/app-tc-ar/page.tsx
index 13d1ea4..5f6d7a7 100644
--- a/apps/marketplace/src/app/(public)/app-tc-ar/page.tsx
+++ b/apps/marketplace/src/app/(public)/app-tc-ar/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import FooterContentPage from '@/components/FooterContentPage'
 
 export default function AppTermsArPage() {
diff --git a/apps/marketplace/src/app/(public)/app-tc-en/page.tsx b/apps/marketplace/src/app/(public)/app-tc-en/page.tsx
index 2546807..9e4f5e4 100644
--- a/apps/marketplace/src/app/(public)/app-tc-en/page.tsx
+++ b/apps/marketplace/src/app/(public)/app-tc-en/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import FooterContentPage from '@/components/FooterContentPage'
 
 export default function AppTermsEnPage() {
diff --git a/apps/marketplace/src/app/(public)/app-tc-fr/page.tsx b/apps/marketplace/src/app/(public)/app-tc-fr/page.tsx
index 73cc5b2..54c7443 100644
--- a/apps/marketplace/src/app/(public)/app-tc-fr/page.tsx
+++ b/apps/marketplace/src/app/(public)/app-tc-fr/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import FooterContentPage from '@/components/FooterContentPage'
 
 export default function AppTermsFrPage() {
diff --git a/apps/marketplace/src/app/(public)/footer/[slug]/page.tsx b/apps/marketplace/src/app/(public)/footer/[slug]/page.tsx
index 7b837fa..f9ddf5a 100644
--- a/apps/marketplace/src/app/(public)/footer/[slug]/page.tsx
+++ b/apps/marketplace/src/app/(public)/footer/[slug]/page.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { notFound } from 'next/navigation'
 import FooterContentPage from '@/components/FooterContentPage'
 import { footerPageSlugs, isFooterPageSlug } from '@/lib/footerContent'
diff --git a/apps/marketplace/src/components/FooterContentPage.tsx b/apps/marketplace/src/components/FooterContentPage.tsx
index c9febfd..b2eb456 100644
--- a/apps/marketplace/src/components/FooterContentPage.tsx
+++ b/apps/marketplace/src/components/FooterContentPage.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 'use client'
 
 import { useMarketplacePreferences } from '@/components/MarketplaceShell'
diff --git a/apps/marketplace/src/lib/api.test.ts b/apps/marketplace/src/lib/api.test.ts
index 82f476c..68875a8 100644
--- a/apps/marketplace/src/lib/api.test.ts
+++ b/apps/marketplace/src/lib/api.test.ts
@@ -14,7 +14,7 @@ describe('marketplace API helpers', () => {
     Object.defineProperty(globalThis, 'fetch', { configurable: true, value: fetchMock })
 
     await expect(marketplaceFetch('/marketplace/vehicles')).resolves.toEqual([{ id: 'vehicle_1' }])
-    expect(fetchMock).toHaveBeenCalledWith('http://localhost:4000/api/v1/marketplace/vehicles', { cache: 'no-store' })
+    expect(fetchMock).toHaveBeenCalledWith(expect.stringMatching(/\/api\/v1\/marketplace\/vehicles$/), { cache: 'no-store' })
   })
 
   it('throws rich marketplace API errors', async () => {
diff --git a/apps/marketplace/src/lib/renter.test.ts b/apps/marketplace/src/lib/renter.test.ts
index fb7b317..74a4ef3 100644
--- a/apps/marketplace/src/lib/renter.test.ts
+++ b/apps/marketplace/src/lib/renter.test.ts
@@ -31,7 +31,7 @@ describe('renter client helpers', () => {
 
     clearRenterSession()
 
-    expect(fetchMock).toHaveBeenCalledWith('http://localhost:4000/api/v1/auth/renter/logout', expect.objectContaining({
+    expect(fetchMock).toHaveBeenCalledWith(expect.stringMatching(/\/api\/v1\/auth\/renter\/logout$/), expect.objectContaining({
       method: 'POST',
       credentials: 'include',
     }))
@@ -44,7 +44,7 @@ describe('renter client helpers', () => {
     const { loadRenterProfile } = await import('./renter')
 
     await expect(loadRenterProfile()).resolves.toEqual({ id: 'renter_1' })
-    expect(fetchMock).toHaveBeenCalledWith('http://localhost:4000/api/v1/auth/renter/me', expect.objectContaining({
+    expect(fetchMock).toHaveBeenCalledWith(expect.stringMatching(/\/api\/v1\/auth\/renter\/me$/), expect.objectContaining({
       credentials: 'include',
       headers: expect.objectContaining({ 'Content-Type': 'application/json' }),
     }))
@@ -70,7 +70,7 @@ describe('renter client helpers', () => {
     const body = [{ notificationType: 'reservation', channel: 'email', enabled: true }]
 
     await expect(updateRenterPreferences(body)).resolves.toEqual({ success: true })
-    expect(fetchMock).toHaveBeenCalledWith('http://localhost:4000/api/v1/notifications/renter/preferences', expect.objectContaining({
+    expect(fetchMock).toHaveBeenCalledWith(expect.stringMatching(/\/api\/v1\/notifications\/renter\/preferences$/), expect.objectContaining({
       method: 'PATCH',
       body: JSON.stringify(body),
     }))
diff --git a/apps/marketplace/tsconfig.json b/apps/marketplace/tsconfig.json
index b575f7d..5d606a9 100644
--- a/apps/marketplace/tsconfig.json
+++ b/apps/marketplace/tsconfig.json
@@ -15,7 +15,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "react-jsx",
+    "jsx": "preserve",
     "incremental": true,
     "plugins": [
       {
diff --git a/package-lock.json b/package-lock.json
index 3d63acf..fd13fed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10743,6 +10743,21 @@
       "engines": {
         "node": ">= 10"
       }
+    },
+    "node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "14.2.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz",
+      "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     }
   }
 }