diff --git a/app/features/auth/core/DiscordStrategy.server.ts b/app/features/auth/core/DiscordStrategy.server.ts
index 01662510d..1ad6e89c1 100644
--- a/app/features/auth/core/DiscordStrategy.server.ts
+++ b/app/features/auth/core/DiscordStrategy.server.ts
@@ -172,12 +172,12 @@ function authEnvVars() {
 	if (process.env.NODE_ENV === "production") {
 		invariant(process.env.DISCORD_CLIENT_ID);
 		invariant(process.env.DISCORD_CLIENT_SECRET);
-		invariant(process.env.BASE_URL);
+		invariant(import.meta.env.VITE_SITE_DOMAIN);
 
 		return {
 			DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID,
 			DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET,
-			BASE_URL: process.env.BASE_URL,
+			BASE_URL: import.meta.env.VITE_SITE_DOMAIN,
 		};
 	}
 
@@ -185,6 +185,6 @@ function authEnvVars() {
 	return {
 		DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID ?? "",
 		DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET ?? "",
-		BASE_URL: process.env.BASE_URL ?? "",
+		BASE_URL: import.meta.env.VITE_SITE_DOMAIN ?? "",
 	};
 }
diff --git a/app/features/tournament/TournamentRepository.server.ts b/app/features/tournament/TournamentRepository.server.ts
index 936d815d5..5cbde6984 100644
--- a/app/features/tournament/TournamentRepository.server.ts
+++ b/app/features/tournament/TournamentRepository.server.ts
@@ -266,7 +266,7 @@ export async function findById(id: number) {
 		...result,
 		logoSrc: result.logoUrl
 			? userSubmittedImage(result.logoUrl)
-			: `${process.env.BASE_URL}${HACKY_resolvePicture(result)}`,
+			: `${import.meta.env.VITE_SITE_DOMAIN}${HACKY_resolvePicture(result)}`,
 		participatedUsers: result.participatedUsers.map((user) => user.userId),
 	};
 }