diff --git a/.env b/.env
index fce9ada5..d86173ea 100644
--- a/.env
+++ b/.env
@@ -5,10 +5,11 @@ WORDPRESS_APP_PASSWORD=DlJH 49dp fC3a Itc3 Sl7Z Wz0k'
 
 # Umami Analytics
 NEXT_PUBLIC_UMAMI_WEBSITE_ID=59a7db94-0100-4c7e-98ef-99f45b17f9c3
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
 
 # GlitchTip (Sentry protocol)
 SENTRY_DSN=https://c10957d0182245b1a2a806ac2d34a197@errors.infra.mintel.me/1
+NEXT_PUBLIC_SENTRY_DSN=https://c10957d0182245b1a2a806ac2d34a197@klz-cables.com/errors/1
 
 # SMTP Configuration
 MAIL_HOST=smtp.eu.mailgun.org
diff --git a/.env.example b/.env.example
index 5e49e3f1..334e82a4 100644
--- a/.env.example
+++ b/.env.example
@@ -6,10 +6,11 @@ WORDPRESS_APP_PASSWORD=
 
 # Umami Analytics
 NEXT_PUBLIC_UMAMI_WEBSITE_ID=
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
 
 # GlitchTip (Sentry protocol)
 SENTRY_DSN=
+# Client-side DSN should use the proxy path: https://[key]@[domain]/errors/[id]
 NEXT_PUBLIC_SENTRY_DSN=
 
 # SMTP Configuration
diff --git a/lib/services/analytics/umami-analytics-service.ts b/lib/services/analytics/umami-analytics-service.ts
index 72ffb335..5099cedb 100644
--- a/lib/services/analytics/umami-analytics-service.ts
+++ b/lib/services/analytics/umami-analytics-service.ts
@@ -76,7 +76,7 @@ export class UmamiAnalyticsService implements AnalyticsService {
     if (typeof window === 'undefined') {
       const { getServerAppServices } = require('../create-services.server');
       const websiteId = process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID;
-      const umamiUrl = process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL?.replace('/script.js', '') || 'https://analytics.infra.mintel.me';
+      const umamiUrl = process.env.UMAMI_SCRIPT_URL?.replace('/script.js', '') || 'https://analytics.infra.mintel.me';
       
       if (!websiteId) return;
 
diff --git a/lib/services/create-services.server.ts b/lib/services/create-services.server.ts
index f3ac79f5..e9daa804 100644
--- a/lib/services/create-services.server.ts
+++ b/lib/services/create-services.server.ts
@@ -21,6 +21,7 @@ export function getServerAppServices(): AppServices {
     NEXT_PUBLIC_UMAMI_WEBSITE_ID: process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID
       ? `***${process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID.slice(-4)}`
       : 'not set',
+    UMAMI_SCRIPT_URL: process.env.UMAMI_SCRIPT_URL ?? 'not set',
     SENTRY_DSN: process.env.SENTRY_DSN
       ? `***${process.env.SENTRY_DSN.slice(-4)}`
       : 'not set',
diff --git a/lib/services/create-services.ts b/lib/services/create-services.ts
index 7cafa486..b41c281d 100644
--- a/lib/services/create-services.ts
+++ b/lib/services/create-services.ts
@@ -80,6 +80,7 @@ export function getAppServices(): AppServices {
     NEXT_PUBLIC_UMAMI_WEBSITE_ID: process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID
       ? `***${process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID.slice(-4)}`
       : 'not set',
+    UMAMI_SCRIPT_URL: process.env.UMAMI_SCRIPT_URL ?? 'not set',
     NEXT_PUBLIC_SENTRY_DSN: process.env.NEXT_PUBLIC_SENTRY_DSN
       ? `***${process.env.NEXT_PUBLIC_SENTRY_DSN.slice(-4)}`
       : 'not set',
diff --git a/next.config.mjs b/next.config.mjs
index 173521fa..5b1c7282 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -343,7 +343,7 @@ const nextConfig = {
     contentSecurityPolicy: "default-src 'self'; script-src 'none'; sandbox;",
   },
   async rewrites() {
-    const umamiUrl = process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL?.replace('/script.js', '') || 'https://analytics.infra.mintel.me';
+    const umamiUrl = (process.env.UMAMI_SCRIPT_URL || 'https://analytics.infra.mintel.me').replace('/script.js', '');
     const glitchtipUrl = process.env.SENTRY_DSN ? new URL(process.env.SENTRY_DSN).origin : 'https://errors.infra.mintel.me';
 
     return [
diff --git a/sentry.client.config.ts b/sentry.client.config.ts
index ae392f17..408012cd 100644
--- a/sentry.client.config.ts
+++ b/sentry.client.config.ts
@@ -1,10 +1,9 @@
 import * as Sentry from '@sentry/nextjs';
 
-const dsn = process.env.NEXT_PUBLIC_SENTRY_DSN || 'https://c10957d0182245b1a2a806ac2d34a197@klz-cables.com/errors/1';
+const dsn = process.env.NEXT_PUBLIC_SENTRY_DSN;
 
 Sentry.init({
   dsn,
-  tunnel: '/errors/tunnel',
   enabled: Boolean(dsn),
   tracesSampleRate: 0,
 });