diff --git a/frontend/.gitignore b/frontend/.gitignore
index 6635cf5542756197081eedaa1ec3a7c2c5a0b537..e91699ff5893f3916c7d6d2f9455a02eb6ae636e 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -3,8 +3,6 @@ node_modules
 /build
 /.svelte-kit
 /package
-.env
-.env.*
 !.env.example
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts
index 3d0e49fdab09cd09d04f7d0cc49dd905b1c9fbe4..22c87bb5f7161c53bcf0d7cc5ee1d37619f4daf6 100644
--- a/frontend/src/lib/config.ts
+++ b/frontend/src/lib/config.ts
@@ -1,15 +1,10 @@
-import {
-	PUBLIC_API_URL,
-	PUBLIC_API_PROXY,
-	PUBLIC_APP_URL,
-	PUBLIC_WS_URL
-} from '$env/static/public';
+import { env } from '$env/dynamic/public';
 
 export default {
-	API_URL: PUBLIC_API_URL || 'https://languagelab.be/tmp-api',
-	API_PROXY: PUBLIC_API_PROXY || 'https://languagelab.be/tmp-api',
-	APP_URL: PUBLIC_APP_URL || 'https://languagelab.be',
-	WS_URL: PUBLIC_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws',
+	API_URL: env.PUBLIC_API_URL,
+	API_PROXY: env.PUBLIC_API_PROXY,
+	APP_URL: env.PUBLIC_APP_URL,
+	WS_URL: env.PUBLIC_WS_URL,
 	// 1 week - 2 hours
 	WEEKLY_SURVEY_INTERVAL: (7 * 24 - 2) * 60 * 60 * 1000,
 	LEARNING_LANGUAGES: {
diff --git a/frontend/src/types.d.ts b/frontend/src/types.d.ts
index 970eb1bdc17f023284a5f6e290aed8a1563a35e9..b7f377b1425f4faca021ef2f80984899ef5664fe 100644
--- a/frontend/src/types.d.ts
+++ b/frontend/src/types.d.ts
@@ -1,6 +1,5 @@
-declare module '$env/static/public' {
-	export const PUBLIC_API_URL: string;
-	export const PUBLIC_API_PROXY: string;
-	export const PUBLIC_APP_URL: string;
-	export const PUBLIC_WS_URL: string;
+declare module '$env/dynamic/public' {
+	export const env: {
+		[key: string]: string;
+	};
 }
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index a9380f396de462c9a0717adf8f2587b2486cdb5e..a76f2ab5f34f065df0bc5571047c14c0788ac7b8 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -15,6 +15,6 @@
 		"module": "ESNext",
 		"isolatedModules": true
 	},
-	"include": ["src/**/*", "global.d.ts", ".svelte-kit/ambient.d.ts"],
+	"include": ["src/**/*", "global.d.ts"],
 	"exclude": ["node_modules", ".svelte-kit/*", "build/*"]
 }