diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
index 7d463a64b..edb86fd19 100644
--- a/apps/web/app/constants.ts
+++ b/apps/web/app/constants.ts
@@ -65,7 +65,6 @@ export const smtpConfiguration: () => I_SMTPRequest = () => ({
 });
 
 // Cookies
-// export const COOKIE_DOMAINS = (process.env.NEXT_PUBLIC_COOKIE_DOMAINS || 'ever.team').split(',').map((d) => d.trim());
 export const COOKIE_DOMAINS = getNextPublicEnv('NEXT_PUBLIC_COOKIE_DOMAINS', {
 	default: 'ever.team',
 	map(value) {
@@ -98,7 +97,7 @@ export const jitsuConfiguration: () => JitsuOptions = () => ({
 });
 
 // Github Integration
-export const GITHUB_APP_NAME = process.env.NEXT_PUBLIC_GITHUB_APP_NAME || 'ever-github';
+export const GITHUB_APP_NAME = getNextPublicEnv('NEXT_PUBLIC_GITHUB_APP_NAME', 'ever-github');
 
 // Application Languages
 export const APPLICATION_LANGUAGES = [
diff --git a/apps/web/lib/settings/integration-setting.tsx b/apps/web/lib/settings/integration-setting.tsx
index 03c3e990d..ea72f157b 100644
--- a/apps/web/lib/settings/integration-setting.tsx
+++ b/apps/web/lib/settings/integration-setting.tsx
@@ -27,7 +27,7 @@ export const IntegrationSetting = () => {
 	}, []);
 
 	const queries = new URLSearchParams(params || {});
-	const url = `https://github.com/apps/${GITHUB_APP_NAME}/installations/new?${queries.toString()}`;
+	const url = `https://github.com/apps/${GITHUB_APP_NAME.value}/installations/new?${queries.toString()}`;
 
 	const { activeTeam } = useOrganizationTeams();