diff --git a/.env.example b/.env.example
index 929278081..8bcb4039d 100644
--- a/.env.example
+++ b/.env.example
@@ -37,7 +37,7 @@ CLIENT_ID_VERCEL=
 CLIENT_ID_NETLIFY=
 CLIENT_ID_GITHUB=
 CLIENT_ID_GITHUB_APP=
-CLIENT_SLUG_GITHUB=
+CLIENT_SLUG_GITHUB_APP=
 CLIENT_ID_GITLAB=
 CLIENT_ID_BITBUCKET=
 CLIENT_SECRET_HEROKU=
@@ -49,8 +49,8 @@ CLIENT_SECRET_GITLAB=
 CLIENT_SECRET_BITBUCKET=
 CLIENT_SLUG_VERCEL=
 
-GITHUB_APP_PRIVATE_KEY=
-GITHUB_APP_ID=
+CLIENT_PRIVATE_KEY_GITHUB_APP=
+CLIENT_APP_ID_GITHUB_APP=
 
 # Sentry (optional) for monitoring errors
 SENTRY_DSN=
diff --git a/backend/src/lib/config/env.ts b/backend/src/lib/config/env.ts
index 7c10c433c..376b03005 100644
--- a/backend/src/lib/config/env.ts
+++ b/backend/src/lib/config/env.ts
@@ -120,12 +120,12 @@ const envSchema = z
     // github oauth
     CLIENT_ID_GITHUB: zpStr(z.string().optional()),
     CLIENT_SECRET_GITHUB: zpStr(z.string().optional()),
-    CLIENT_SLUG_GITHUB: zpStr(z.string().optional()),
+    CLIENT_SLUG_GITHUB_APP: zpStr(z.string().optional()),
     // github app
     CLIENT_ID_GITHUB_APP: zpStr(z.string().optional()),
     CLIENT_SECRET_GITHUB_APP: zpStr(z.string().optional()),
-    GITHUB_APP_PRIVATE_KEY: zpStr(z.string().optional()),
-    GITHUB_APP_ID: z.coerce.number().optional(),
+    CLIENT_PRIVATE_KEY_GITHUB_APP: zpStr(z.string().optional()),
+    CLIENT_APP_ID_GITHUB_APP: z.coerce.number().optional(),
 
     // azure
     CLIENT_ID_AZURE: zpStr(z.string().optional()),
diff --git a/backend/src/services/integration-auth/integration-app-list.ts b/backend/src/services/integration-auth/integration-app-list.ts
index 5882983e0..44ac825c7 100644
--- a/backend/src/services/integration-auth/integration-app-list.ts
+++ b/backend/src/services/integration-auth/integration-app-list.ts
@@ -257,8 +257,8 @@ const getAppsGithub = async ({
     const octokit = new Octokit({
       authStrategy: createAppAuth,
       auth: {
-        appId: appCfg.GITHUB_APP_ID,
-        privateKey: appCfg.GITHUB_APP_PRIVATE_KEY,
+        appId: appCfg.CLIENT_APP_ID_GITHUB_APP,
+        privateKey: appCfg.CLIENT_PRIVATE_KEY_GITHUB_APP,
         installationId: authMetadata.installationId
       }
     });
diff --git a/backend/src/services/integration-auth/integration-auth-service.ts b/backend/src/services/integration-auth/integration-auth-service.ts
index 8f5dbe1b3..bcfe2c773 100644
--- a/backend/src/services/integration-auth/integration-auth-service.ts
+++ b/backend/src/services/integration-auth/integration-auth-service.ts
@@ -647,8 +647,8 @@ export const integrationAuthServiceFactory = ({
       octokit = new Octokit({
         authStrategy: createAppAuth,
         auth: {
-          appId: appCfg.GITHUB_APP_ID,
-          privateKey: appCfg.GITHUB_APP_PRIVATE_KEY,
+          appId: appCfg.CLIENT_APP_ID_GITHUB_APP,
+          privateKey: appCfg.CLIENT_PRIVATE_KEY_GITHUB_APP,
           installationId
         }
       });
@@ -724,8 +724,8 @@ export const integrationAuthServiceFactory = ({
       octokit = new Octokit({
         authStrategy: createAppAuth,
         auth: {
-          appId: appCfg.GITHUB_APP_ID,
-          privateKey: appCfg.GITHUB_APP_PRIVATE_KEY,
+          appId: appCfg.CLIENT_APP_ID_GITHUB_APP,
+          privateKey: appCfg.CLIENT_PRIVATE_KEY_GITHUB_APP,
           installationId: authMetadata.installationId
         }
       });
diff --git a/backend/src/services/integration-auth/integration-delete-secret.ts b/backend/src/services/integration-auth/integration-delete-secret.ts
index d8ec89b15..7cf77cb26 100644
--- a/backend/src/services/integration-auth/integration-delete-secret.ts
+++ b/backend/src/services/integration-auth/integration-delete-secret.ts
@@ -183,8 +183,8 @@ export const deleteGithubSecrets = async ({
     octokit = new OctokitWithRetry({
       authStrategy: createAppAuth,
       auth: {
-        appId: appCfg.GITHUB_APP_ID,
-        privateKey: appCfg.GITHUB_APP_PRIVATE_KEY,
+        appId: appCfg.CLIENT_APP_ID_GITHUB_APP,
+        privateKey: appCfg.CLIENT_PRIVATE_KEY_GITHUB_APP,
         installationId: authMetadata.installationId
       }
     });
diff --git a/backend/src/services/integration-auth/integration-list.ts b/backend/src/services/integration-auth/integration-list.ts
index 8019ae9b8..af9d358ed 100644
--- a/backend/src/services/integration-auth/integration-list.ts
+++ b/backend/src/services/integration-auth/integration-list.ts
@@ -140,7 +140,7 @@ export const getIntegrationOptions = async () => {
       isAvailable: true,
       type: "oauth",
       clientId: appCfg.CLIENT_ID_GITHUB,
-      clientSlug: appCfg.CLIENT_SLUG_GITHUB,
+      clientSlug: appCfg.CLIENT_SLUG_GITHUB_APP,
       docsLink: ""
     },
     {
diff --git a/backend/src/services/integration-auth/integration-sync-secret.ts b/backend/src/services/integration-auth/integration-sync-secret.ts
index a46b62f5e..6b81b31a8 100644
--- a/backend/src/services/integration-auth/integration-sync-secret.ts
+++ b/backend/src/services/integration-auth/integration-sync-secret.ts
@@ -1565,8 +1565,8 @@ const syncSecretsGitHub = async ({
     octokit = new Octokit({
       authStrategy: createAppAuth,
       auth: {
-        appId: appCfg.GITHUB_APP_ID,
-        privateKey: appCfg.GITHUB_APP_PRIVATE_KEY,
+        appId: appCfg.CLIENT_APP_ID_GITHUB_APP,
+        privateKey: appCfg.CLIENT_PRIVATE_KEY_GITHUB_APP,
         installationId: authMetadata.installationId
       }
     });
diff --git a/backend/src/services/integration-auth/integration-token.ts b/backend/src/services/integration-auth/integration-token.ts
index 6daacd62a..9b4e5c20f 100644
--- a/backend/src/services/integration-auth/integration-token.ts
+++ b/backend/src/services/integration-auth/integration-token.ts
@@ -249,7 +249,7 @@ const exchangeCodeGithub = async ({ code, installationId }: { code: string; inst
 
   if (installationId) {
     // handle app installations
-    const res = (
+    const oauthRes = (
       await request.get<ExchangeCodeGithubResponse>(IntegrationUrls.GITHUB_TOKEN_URL, {
         params: {
           client_id: appCfg.CLIENT_ID_GITHUB_APP,
@@ -276,7 +276,7 @@ const exchangeCodeGithub = async ({ code, installationId }: { code: string; inst
       }>(IntegrationUrls.GITHUB_USER_INSTALLATIONS, {
         headers: {
           Accept: "application/json",
-          Authorization: `Bearer ${res.access_token}`,
+          Authorization: `Bearer ${oauthRes.access_token}`,
           "Accept-Encoding": "application/json"
         }
       })
@@ -293,14 +293,14 @@ const exchangeCodeGithub = async ({ code, installationId }: { code: string; inst
     }
 
     return {
-      accessToken: "",
+      accessToken: "", // for github app integrations, we only need the installationID from the metadata
       refreshToken: null,
       accessExpiresAt: null,
       installationName: matchingInstallation.account.login
     };
   }
 
-  // handle normal oauth
+  // handle oauth github integration
   const res = (
     await request.get<ExchangeCodeGithubResponse>(IntegrationUrls.GITHUB_TOKEN_URL, {
       params: {