diff --git a/apps/webservice/src/app/[workspaceSlug]/(job)/job-agents/add/GithubConfig.tsx b/apps/webservice/src/app/[workspaceSlug]/(job)/job-agents/add/GithubConfig.tsx
index 20d975e10..84530e3bd 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(job)/job-agents/add/GithubConfig.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(job)/job-agents/add/GithubConfig.tsx
@@ -116,7 +116,7 @@ export const GithubJobAgentConfig: React.FC<{
 
                       <CommandItem>
                         <a
-                          href={`${env.GITHUB_URL}/apps/${env.GITHUB_BOT_NAME}/installations/select_target?target_id=${githubUser.githubUserId}?redirect_uri=${env.BASE_URL}/${workspaceSlug}/job-agents/add`}
+                          href={`${env.NEXT_PUBLIC_GITHUB_URL}/apps/${env.NEXT_PUBLIC_GITHUB_BOT_NAME}/installations/select_target?target_id=${githubUser.githubUserId}?redirect_uri=${env.NEXT_PUBLIC_BASE_URL}/${workspaceSlug}/job-agents/add`}
                           className="flex items-center gap-2"
                         >
                           <TbPlus />
diff --git a/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/GithubOrgConfig.tsx b/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/GithubOrgConfig.tsx
index d774a936a..908f9efad 100644
--- a/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/GithubOrgConfig.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/GithubOrgConfig.tsx
@@ -138,7 +138,7 @@ export const GithubOrgConfig: React.FC<{
 
                       <CommandItem>
                         <a
-                          href={`${env.GITHUB_URL}/apps/${env.GITHUB_BOT_NAME}/installations/select_target?target_id=${githubUser?.githubUserId}?redirect_uri=${env.BASE_URL}/${workspaceSlug}/job-agents/add`}
+                          href={`${env.NEXT_PUBLIC_GITHUB_URL}/apps/${env.NEXT_PUBLIC_GITHUB_BOT_NAME}/installations/select_target?target_id=${githubUser?.githubUserId}?redirect_uri=${env.NEXT_PUBLIC_BASE_URL}/${workspaceSlug}/job-agents/add`}
                           className="flex items-center gap-2"
                         >
                           <TbPlus />
@@ -254,7 +254,7 @@ export const GithubOrgConfig: React.FC<{
                   <DropdownMenuContent>
                     <DropdownMenuItem>
                       <a
-                        href={`${env.GITHUB_URL}/organizations/${github_organization.organizationName}/settings/installations/${github_organization.installationId}`}
+                        href={`${env.NEXT_PUBLIC_GITHUB_URL}/organizations/${github_organization.organizationName}/settings/installations/${github_organization.installationId}`}
                         target="_blank"
                         rel="noopener noreferrer"
                         onClick={(e) => {
diff --git a/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/page.tsx b/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/page.tsx
index 3b21573a4..8f03a15ca 100644
--- a/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/integrations/(integration)/github/page.tsx
@@ -13,7 +13,7 @@ import { GithubConfigFileSync } from "./GithubConfigFile";
 import { GithubOrgConfig } from "./GithubOrgConfig";
 
 const githubAuthUrl = (userId?: string, workspaceSlug?: string) =>
-  `${env.GITHUB_URL}/login/oauth/authorize?response_type=code&client_id=${env.NEXT_PUBLIC_GITHUB_BOT_CLIENT_ID}&redirect_uri=${env.BASE_URL}/api/github/${userId}/${workspaceSlug}&state=sLtHqpxQ6FiUtBWJ&scope=repo%2Cread%3Auser`;
+  `${env.NEXT_PUBLIC_GITHUB_URL}/login/oauth/authorize?response_type=code&client_id=${env.NEXT_PUBLIC_GITHUB_BOT_CLIENT_ID}&redirect_uri=${env.NEXT_PUBLIC_BASE_URL}/api/github/${userId}/${workspaceSlug}&state=sLtHqpxQ6FiUtBWJ&scope=repo%2Cread%3Auser`;
 
 export default function GitHubIntegrationPage({
   params,
diff --git a/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/members/WorkspaceMembersTable.tsx b/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/members/WorkspaceMembersTable.tsx
index 44a26e7f9..eef34c9e1 100644
--- a/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/members/WorkspaceMembersTable.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/settings/(settings)/workspace/members/WorkspaceMembersTable.tsx
@@ -59,7 +59,7 @@ const InviteLinkSection: React.FC<{
       );
   }, [mutateAsync, inviteLink, sessionMember?.workspace_member.id, utils]);
 
-  const link = `${env.BASE_URL}/join/${inviteLink.data?.token ?? ""}`;
+  const link = `${env.NEXT_PUBLIC_BASE_URL}/join/${inviteLink.data?.token ?? ""}`;
 
   const handleCopyClick = () =>
     navigator.clipboard.writeText(link).then(() => {
diff --git a/apps/webservice/src/app/api/github/[userId]/[workspaceSlug]/route.ts b/apps/webservice/src/app/api/github/[userId]/[workspaceSlug]/route.ts
index f006637f0..1e5c53fa3 100644
--- a/apps/webservice/src/app/api/github/[userId]/[workspaceSlug]/route.ts
+++ b/apps/webservice/src/app/api/github/[userId]/[workspaceSlug]/route.ts
@@ -15,7 +15,7 @@ export const GET = async (
   const { userId, workspaceSlug } = params;
 
   const tokenResponse = await fetch(
-    `${env.GITHUB_URL}/login/oauth/access_token`,
+    `${env.NEXT_PUBLIC_GITHUB_URL}/login/oauth/access_token`,
     {
       method: "POST",
       headers: {
@@ -53,6 +53,6 @@ export const GET = async (
   });
 
   return NextResponse.redirect(
-    `${env.BASE_URL}/${workspaceSlug}/settings/workspace/integrations/github`,
+    `${env.NEXT_PUBLIC_BASE_URL}/${workspaceSlug}/settings/workspace/integrations/github`,
   );
 };
diff --git a/apps/webservice/src/app/api/workflow-invite-redirect/[workspaceSlug]/route.ts b/apps/webservice/src/app/api/workflow-invite-redirect/[workspaceSlug]/route.ts
index ddce63914..380610da8 100644
--- a/apps/webservice/src/app/api/workflow-invite-redirect/[workspaceSlug]/route.ts
+++ b/apps/webservice/src/app/api/workflow-invite-redirect/[workspaceSlug]/route.ts
@@ -35,10 +35,12 @@ export const GET = async (
         "duplicate key value",
       );
       if (isDuplicateKeyError)
-        return NextResponse.redirect(`${env.BASE_URL}/${workspaceSlug}`);
+        return NextResponse.redirect(
+          `${env.NEXT_PUBLIC_BASE_URL}/${workspaceSlug}`,
+        );
 
       throw e;
     });
 
-  return NextResponse.redirect(`${env.BASE_URL}/${workspaceSlug}`);
+  return NextResponse.redirect(`${env.NEXT_PUBLIC_BASE_URL}/${workspaceSlug}`);
 };
diff --git a/apps/webservice/src/env.ts b/apps/webservice/src/env.ts
index de6e8f7e8..e9cce4dca 100644
--- a/apps/webservice/src/env.ts
+++ b/apps/webservice/src/env.ts
@@ -10,9 +10,9 @@ export const env = createEnv({
     NODE_ENV: z
       .enum(["development", "production", "test"])
       .default("development"),
-    BASE_URL: z.string().default("http://localhost:3000"),
-    GITHUB_URL: z.string().url().default("https://github.com"),
-    GITHUB_BOT_NAME: z.string().min(1).default("kflag"),
+    NEXT_PUBLIC_BASE_URL: z.string().default("http://localhost:3000"),
+    NEXT_PUBLIC_GITHUB_URL: z.string().url().default("https://github.com"),
+    NEXT_PUBLIC_GITHUB_BOT_NAME: z.string().min(1).default("kflag"),
   },
   /**
    * Specify your server-side environment variables schema here.
@@ -28,24 +28,24 @@ export const env = createEnv({
 
   /**
    * Specify your client-side environment variables schema here.
-   * For them to be exposed to the client, prefix them with `NEXT_PUBLIC_`.
+   * For them to be exposed to the client, prefix them with NEXT_PUBLIC_.
    */
   client: {
     NEXT_PUBLIC_GITHUB_BOT_CLIENT_ID: z.string().optional(),
-    // NEXT_PUBLIC_CLIENTVAR: z.string(),
   },
+
   /**
-   * Destructure all variables from `process.env` to make sure they aren't tree-shaken away.
+   * Destructure all variables from process.env to make sure they aren't tree-shaken away.
    */
   experimental__runtimeEnv: {
     NODE_ENV: process.env.NODE_ENV,
-    BASE_URL: process.env.BASE_URL,
-    GITHUB_URL: process.env.GITHUB_URL,
-    GITHUB_BOT_NAME: process.env.GITHUB_BOT_NAME,
+    NEXT_PUBLIC_BASE_URL: process.env.NEXT_PUBLIC_BASE_URL,
+    NEXT_PUBLIC_GITHUB_URL: process.env.NEXT_PUBLIC_GITHUB_URL,
+    NEXT_PUBLIC_GITHUB_BOT_NAME: process.env.NEXT_PUBLIC_GITHUB_BOT_NAME,
     NEXT_PUBLIC_GITHUB_BOT_CLIENT_ID:
       process.env.NEXT_PUBLIC_GITHUB_BOT_CLIENT_ID,
-    // NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
   },
+
   skipValidation:
     !!process.env.CI ||
     !!process.env.SKIP_ENV_VALIDATION ||