diff --git a/backend/config/custom-environment-variables.json b/backend/config/custom-environment-variables.json
index 739611c36e..470fb3c8ae 100644
--- a/backend/config/custom-environment-variables.json
+++ b/backend/config/custom-environment-variables.json
@@ -104,7 +104,8 @@
     "callbackUrl": "CROWD_GITHUB_CALLBACK_URL",
     "privateKey": "CROWD_GITHUB_PRIVATE_KEY",
     "webhookSecret": "CROWD_GITHUB_WEBHOOK_SECRET",
-    "isCommitDataEnabled": "CROWD_GITHUB_IS_COMMIT_DATA_ENABLED"
+    "isCommitDataEnabled": "CROWD_GITHUB_IS_COMMIT_DATA_ENABLED",
+    "isSnowflakeEnabled": "CROWD_GITHUB_IS_SNOWFLAKE_ENABLED"
   },
   "githubIssueReporter": {
     "appId": "CROWD_GITHUB_ISSUE_REPORTER_APP_ID",
diff --git a/backend/package.json b/backend/package.json
index 85bd759f52..f228fe9c6b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -32,7 +32,8 @@
     "script:purge-tenants-and-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/purge-tenants-and-data.ts",
     "script:import-lfx-memberships": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/import-lfx-memberships.ts",
     "script:fix-missing-org-displayName": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/fix-missing-org-displayName.ts",
-    "script:syncActivities": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/syncActivities.ts"
+    "script:syncActivities": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/syncActivities.ts",
+    "script:refreshGithubRepoSettings": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-github-repo-settings.ts"
   },
   "dependencies": {
     "@aws-sdk/client-comprehend": "^3.159.0",
diff --git a/backend/src/api/integration/helpers/githubAuthenticate.ts b/backend/src/api/integration/helpers/githubAuthenticate.ts
new file mode 100644
index 0000000000..36b3d6e242
--- /dev/null
+++ b/backend/src/api/integration/helpers/githubAuthenticate.ts
@@ -0,0 +1,13 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  const payload = await new IntegrationService(req).connectGithub(
+    req.params.code,
+    req.body.installId,
+    req.body.setupAction,
+  )
+  await req.responseHandler.success(req, res, payload)
+}
diff --git a/backend/src/api/integration/helpers/githubConnectInstallation.ts b/backend/src/api/integration/helpers/githubConnectInstallation.ts
new file mode 100644
index 0000000000..d7da9b0f43
--- /dev/null
+++ b/backend/src/api/integration/helpers/githubConnectInstallation.ts
@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  const payload = await new IntegrationService(req).connectGithubInstallation(req.body.installId)
+  await req.responseHandler.success(req, res, payload)
+}
diff --git a/backend/src/api/integration/helpers/githubGetInstallations.ts b/backend/src/api/integration/helpers/githubGetInstallations.ts
new file mode 100644
index 0000000000..08448c107d
--- /dev/null
+++ b/backend/src/api/integration/helpers/githubGetInstallations.ts
@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  const payload = await new IntegrationService(req).getGithubInstallations()
+  await req.responseHandler.success(req, res, payload)
+}
diff --git a/backend/src/api/integration/helpers/githubMapRepos.ts b/backend/src/api/integration/helpers/githubMapRepos.ts
index b76e43da7b..33487b15b3 100644
--- a/backend/src/api/integration/helpers/githubMapRepos.ts
+++ b/backend/src/api/integration/helpers/githubMapRepos.ts
@@ -1,14 +1,27 @@
+import { GITHUB_CONFIG } from '@/conf'
+
 import Permissions from '../../../security/permissions'
 import IntegrationService from '../../../services/integrationService'
 import PermissionChecker from '../../../services/user/permissionChecker'
 
+const isSnowflakeEnabled = GITHUB_CONFIG.isSnowflakeEnabled === 'true'
+
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
-  const payload = await new IntegrationService(req).mapGithubRepos(
-    req.params.id,
-    req.body.mapping,
-    true,
-    req.body?.isUpdateTransaction ?? false,
-  )
+  let payload
+  if (isSnowflakeEnabled) {
+    payload = await new IntegrationService(req).mapGithubReposSnowflake(
+      req.params.id,
+      req.body.mapping,
+      true,
+      req.body?.isUpdateTransaction ?? false,
+    )
+  } else {
+    payload = await new IntegrationService(req).mapGithubRepos(
+      req.params.id,
+      req.body.mapping,
+      true,
+    )
+  }
   await req.responseHandler.success(req, res, payload)
 }
diff --git a/backend/src/api/integration/index.ts b/backend/src/api/integration/index.ts
index 401d204010..fbc3f874b4 100644
--- a/backend/src/api/integration/index.ts
+++ b/backend/src/api/integration/index.ts
@@ -26,9 +26,22 @@ export default (app) => {
   app.get(`/integration/autocomplete`, safeWrap(require('./integrationAutocomplete').default))
   app.get(`/integration/global`, safeWrap(require('./integrationGlobal').default))
   app.get(`/integration/global/status`, safeWrap(require('./integrationGlobalStatus').default))
+
+  app.get(
+    '/integration/github-installations',
+    safeWrap(require('./helpers/githubGetInstallations').default),
+  )
+
+  app.post(
+    '/integration/github-connect-installation',
+    safeWrap(require('./helpers/githubConnectInstallation').default),
+  )
+
   app.get(`/integration`, safeWrap(require('./integrationList').default))
   app.get(`/integration/:id`, safeWrap(require('./integrationFind').default))
 
+  app.put(`/authenticate/:code`, safeWrap(require('./helpers/githubAuthenticate').default))
+
   app.put(`/integration/:id/github/repos`, safeWrap(require('./helpers/githubMapRepos').default))
   app.get(`/integration/:id/github/repos`, safeWrap(require('./helpers/githubMapReposGet').default))
   app.get(
diff --git a/backend/src/bin/jobs/refreshGithubRepoSettings.ts b/backend/src/bin/jobs/refreshGithubRepoSettings.ts
index 5f7070221a..383182cd80 100644
--- a/backend/src/bin/jobs/refreshGithubRepoSettings.ts
+++ b/backend/src/bin/jobs/refreshGithubRepoSettings.ts
@@ -4,12 +4,15 @@ import cronGenerator from 'cron-time-generator'
 import { timeout } from '@crowd/common'
 import { getServiceChildLogger } from '@crowd/logging'
 
+import { GITHUB_CONFIG } from '../../conf'
 import GithubReposRepository from '../../database/repositories/githubReposRepository'
 import SequelizeRepository from '../../database/repositories/sequelizeRepository'
 import GithubIntegrationService from '../../services/githubIntegrationService'
 import IntegrationService from '../../services/integrationService'
 import { CrowdJob } from '../../types/jobTypes'
 
+const IS_GITHUB_SNOWFLAKE_ENABLED = GITHUB_CONFIG.isSnowflakeEnabled === 'true'
+
 const log = getServiceChildLogger('refreshGithubRepoSettings')
 
 interface Integration {
@@ -33,8 +36,7 @@ interface Integration {
   }
 }
 
-export const refreshGithubRepoSettings = async () => {
-  log.info('Updating Github repo settings.')
+const refreshForSnowflake = async () => {
   const dbOptions = await SequelizeRepository.getDefaultIRepositoryOptions()
 
   const githubIntegrations = await dbOptions.database.sequelize.query(
@@ -124,7 +126,7 @@ export const refreshGithubRepoSettings = async () => {
         }
 
         // Map new repos
-        await integrationService.mapGithubRepos(
+        await integrationService.mapGithubReposSnowflake(
           integration.id,
           newFullMapping,
           true,
@@ -150,6 +152,56 @@ export const refreshGithubRepoSettings = async () => {
   log.info('Finished updating Github repo settings.')
 }
 
+const refreshForGitHub = async () => {
+  log.info('Updating Github repo settings.')
+  const dbOptions = await SequelizeRepository.getDefaultIRepositoryOptions()
+
+  interface Integration {
+    id: string
+    tenantId: string
+    integrationIdentifier: string
+  }
+
+  const githubIntegrations = await dbOptions.database.sequelize.query(
+    `SELECT id, "tenantId", "integrationIdentifier" FROM integrations 
+       WHERE platform = 'github' AND "deletedAt" IS NULL
+       AND "createdAt" < NOW() - INTERVAL '1 minute' AND "integrationIdentifier" IS NOT NULL`,
+  )
+
+  for (const integration of githubIntegrations[0] as Integration[]) {
+    log.info(`Updating repo settings for Github integration: ${integration.id}`)
+
+    try {
+      const options = await SequelizeRepository.getDefaultIRepositoryOptions()
+      options.currentTenant = { id: integration.tenantId }
+
+      const integrationService = new IntegrationService(options)
+      // newly discovered repos will be mapped to default segment of the integration
+      await integrationService.updateGithubIntegrationSettings(integration.integrationIdentifier)
+
+      log.info(`Successfully updated repo settings for Github integration: ${integration.id}`)
+    } catch (err) {
+      log.error(
+        `Error updating repo settings for Github integration ${integration.id}: ${err.message}`,
+      )
+    } finally {
+      await timeout(1000)
+    }
+  }
+
+  log.info('Finished updating Github repo settings.')
+}
+
+export const refreshGithubRepoSettings = async () => {
+  log.info('Updating Github repo settings.')
+
+  if (IS_GITHUB_SNOWFLAKE_ENABLED) {
+    await refreshForSnowflake()
+  } else {
+    await refreshForGitHub()
+  }
+}
+
 const job: CrowdJob = {
   name: 'Refresh Github repo settings',
   // every day
diff --git a/backend/src/conf/configTypes.ts b/backend/src/conf/configTypes.ts
index fa5a108683..893f7762fe 100644
--- a/backend/src/conf/configTypes.ts
+++ b/backend/src/conf/configTypes.ts
@@ -120,6 +120,7 @@ export interface GithubConfiguration {
   privateKey: string
   webhookSecret: string
   isCommitDataEnabled: string
+  isSnowflakeEnabled: string
   globalLimit?: number
   callbackUrl: string
 }
diff --git a/backend/src/database/repositories/githubReposRepository.ts b/backend/src/database/repositories/githubReposRepository.ts
index c53971ac9e..30f0d843b4 100644
--- a/backend/src/database/repositories/githubReposRepository.ts
+++ b/backend/src/database/repositories/githubReposRepository.ts
@@ -38,7 +38,24 @@ export default class GithubReposRepository {
     )
   }
 
-  static async updateMapping(
+  static async updateMapping(integrationId, mapping, options: IRepositoryOptions) {
+    const tenantId = options.currentTenant.id
+
+    await GithubReposRepository.bulkInsert(
+      'githubRepos',
+      ['tenantId', 'integrationId', 'segmentId', 'url'],
+      (idx) => `(:tenantId_${idx}, :integrationId_${idx}, :segmentId_${idx}, :url_${idx})`,
+      Object.entries(mapping).map(([url, segmentId], idx) => ({
+        [`tenantId_${idx}`]: tenantId,
+        [`integrationId_${idx}`]: integrationId,
+        [`segmentId_${idx}`]: segmentId,
+        [`url_${idx}`]: url,
+      })),
+      options,
+    )
+  }
+
+  static async updateMappingSnowflake(
     integrationId,
     newMapping: Record<string, string>,
     oldMapping: {
diff --git a/backend/src/serverless/integrations/types/regularTypes.ts b/backend/src/serverless/integrations/types/regularTypes.ts
index f7c5f1f8cb..b2509c5c81 100644
--- a/backend/src/serverless/integrations/types/regularTypes.ts
+++ b/backend/src/serverless/integrations/types/regularTypes.ts
@@ -3,7 +3,13 @@ import { PlatformType } from '@crowd/types'
 export type Repo = {
   url: string
   name: string
-  updatedAt: string
+  updatedAt?: string
+  createdAt?: string
+  owner?: string
+  available?: boolean
+  fork?: boolean
+  private?: boolean
+  cloneUrl?: string
 }
 
 export type Repos = Array<Repo>
diff --git a/backend/src/serverless/integrations/usecases/github/rest/getInstalledRepositories.ts b/backend/src/serverless/integrations/usecases/github/rest/getInstalledRepositories.ts
new file mode 100644
index 0000000000..1e00f75dba
--- /dev/null
+++ b/backend/src/serverless/integrations/usecases/github/rest/getInstalledRepositories.ts
@@ -0,0 +1,64 @@
+import axios, { AxiosRequestConfig } from 'axios'
+
+import { getServiceChildLogger } from '@crowd/logging'
+
+import { Repos } from '../../../types/regularTypes'
+
+const log = getServiceChildLogger('getInstalledRepositories')
+
+const getRepositoriesFromGH = async (page: number, installToken: string): Promise<any> => {
+  const REPOS_PER_PAGE = 100
+
+  const requestConfig = {
+    method: 'get',
+    url: `https://api.github.com/installation/repositories?page=${page}&per_page=${REPOS_PER_PAGE}`,
+    headers: {
+      Authorization: `Bearer ${installToken}`,
+    },
+  } as AxiosRequestConfig
+
+  const response = await axios(requestConfig)
+  return response.data
+}
+
+const parseRepos = (repositories: any): Repos => {
+  const repos: Repos = []
+
+  for (const repo of repositories) {
+    repos.push({
+      url: repo.html_url,
+      owner: repo.owner.login,
+      createdAt: repo.created_at,
+      name: repo.name,
+      fork: repo.fork,
+      private: repo.private,
+      cloneUrl: repo.clone_url,
+    })
+  }
+
+  return repos
+}
+
+export const getInstalledRepositories = async (installToken: string): Promise<Repos> => {
+  try {
+    let page = 1
+    let hasMorePages = true
+
+    const repos: Repos = []
+
+    while (hasMorePages) {
+      const data = await getRepositoriesFromGH(page, installToken)
+
+      if (data.repositories) {
+        repos.push(...parseRepos(data.repositories))
+      }
+
+      hasMorePages = data.total_count && data.total_count > 0 && data.total_count > repos.length
+      page += 1
+    }
+    return repos.filter((repo) => !repo.private && !repo.fork)
+  } catch (err: any) {
+    log.error(err, 'Error fetching installed repositories!')
+    throw err
+  }
+}
diff --git a/backend/src/serverless/integrations/usecases/github/rest/getRemoteStats.ts b/backend/src/serverless/integrations/usecases/github/rest/getRemoteStats.ts
index 4071dd5cc2..491ada86dc 100644
--- a/backend/src/serverless/integrations/usecases/github/rest/getRemoteStats.ts
+++ b/backend/src/serverless/integrations/usecases/github/rest/getRemoteStats.ts
@@ -28,9 +28,10 @@ const checkHeaders = (response: AxiosResponse<any>, defaultValue = 0): number =>
 }
 
 const getStatsForRepo = async (repoUrl: string, token: string): Promise<GitHubStats> => {
-  const [owner, repo] = repoUrl.split('/').slice(-2)
+  try {
+    const [owner, repo] = repoUrl.split('/').slice(-2)
 
-  const query = `
+    const query = `
         query {
         repository(owner: "${owner}", name: "${repo}") {
           starCount: stargazers {
@@ -49,44 +50,53 @@ const getStatsForRepo = async (repoUrl: string, token: string): Promise<GitHubSt
         }
     }`
 
-  const result = await axios.post(
-    'https://api.github.com/graphql',
-    {
-      query,
-    },
-    {
-      headers: {
-        Authorization: `bearer ${token}`,
+    const result = await axios.post(
+      'https://api.github.com/graphql',
+      {
+        query,
       },
-    },
-  )
-
-  const prsAll = await axios.get(
-    `https://api.github.com/repos/${owner}/${repo}/pulls?state=all&per_page=1`,
-    {
-      headers: {
-        Authorization: `bearer ${token}`,
+      {
+        headers: {
+          Authorization: `bearer ${token}`,
+        },
       },
-    },
-  )
-
-  let out
+    )
+
+    const prsAll = await axios.get(
+      `https://api.github.com/repos/${owner}/${repo}/pulls?state=all&per_page=1`,
+      {
+        headers: {
+          Authorization: `bearer ${token}`,
+        },
+      },
+    )
+
+    let out
+
+    try {
+      out = {
+        stars: result.data.data.repository.starCount.totalCount,
+        forks: result.data.data.repository.forkCountDirect.totalCount,
+        totalIssues:
+          result.data.data.repository.issuesOpened.totalCount +
+          result.data.data.repository.issuesClosed.totalCount,
+        totalPRs: checkHeaders(prsAll),
+      }
+    } catch (e) {
+      log.error('Error getting stats for repo', e)
+      throw e
+    }
 
-  try {
-    out = {
-      stars: result.data.data.repository.starCount.totalCount,
-      forks: result.data.data.repository.forkCountDirect.totalCount,
-      totalIssues:
-        result.data.data.repository.issuesOpened.totalCount +
-        result.data.data.repository.issuesClosed.totalCount,
-      totalPRs: checkHeaders(prsAll),
+    return out
+  } catch (error) {
+    log.error(`Error fetching GitHub stats for repo ${repoUrl}:`, error)
+    return {
+      stars: 0,
+      forks: 0,
+      totalIssues: 0,
+      totalPRs: 0,
     }
-  } catch (e) {
-    log.error('Error getting stats for repo', e)
-    throw e
   }
-
-  return out
 }
 
 export const getGitHubRemoteStats = async (
diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index 7c553c8eca..7691492a08 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -1,17 +1,19 @@
 /* eslint-disable no-promise-executor-return */
 import { createAppAuth } from '@octokit/auth-app'
+import { request } from '@octokit/request'
 import axios, { AxiosRequestConfig, AxiosResponse } from 'axios'
 import lodash from 'lodash'
 import moment from 'moment'
 
-import { EDITION, Error400, Error404 } from '@crowd/common'
+import { EDITION, Error400, Error404, Error542 } from '@crowd/common'
 import { RedisCache } from '@crowd/redis'
 import { Edition, PlatformType } from '@crowd/types'
 
 import { IRepositoryOptions } from '@/database/repositories/IRepositoryOptions'
+import GithubInstallationsRepository from '@/database/repositories/githubInstallationsRepository'
 import GitlabReposRepository from '@/database/repositories/gitlabReposRepository'
 import IntegrationProgressRepository from '@/database/repositories/integrationProgressRepository'
-import { IntegrationProgress } from '@/serverless/integrations/types/regularTypes'
+import { IntegrationProgress, Repos } from '@/serverless/integrations/types/regularTypes'
 import {
   fetchAllGitlabGroups,
   fetchGitlabGroupProjects,
@@ -40,6 +42,7 @@ import SequelizeRepository from '../database/repositories/sequelizeRepository'
 import telemetryTrack from '../segment/telemetryTrack'
 import track from '../segment/track'
 import { ILinkedInOrganization } from '../serverless/integrations/types/linkedinTypes'
+import { getInstalledRepositories } from '../serverless/integrations/usecases/github/rest/getInstalledRepositories'
 import {
   GitHubStats,
   getGitHubRemoteStats,
@@ -384,7 +387,201 @@ export default class IntegrationService {
     return lodash.maxBy(Object.keys(owners), (owner) => owners[owner])
   }
 
-  async mapGithubRepos(integrationId, mapping, fireOnboarding = true, isUpdateTransaction = false) {
+  async connectGithub(code, installId, setupAction = 'install') {
+    if (setupAction === 'request') {
+      return this.createOrUpdate(
+        {
+          platform: PlatformType.GITHUB,
+          status: 'waiting-approval',
+        },
+        await SequelizeRepository.createTransaction(this.options),
+      )
+    }
+
+    const GITHUB_AUTH_ACCESSTOKEN_URL = 'https://github.com/login/oauth/access_token'
+    const CLIENT_ID = GITHUB_CONFIG.clientId
+    const CLIENT_SECRET = GITHUB_CONFIG.clientSecret
+
+    const tokenResponse = await axios({
+      method: 'post',
+      url: GITHUB_AUTH_ACCESSTOKEN_URL,
+      data: {
+        client_id: CLIENT_ID,
+        client_secret: CLIENT_SECRET,
+        code,
+      },
+    })
+
+    let token = tokenResponse.data
+    token = token.slice(token.search('=') + 1, token.search('&'))
+
+    try {
+      const requestWithAuth = request.defaults({
+        headers: {
+          authorization: `token ${token}`,
+        },
+      })
+      await requestWithAuth('GET /user')
+    } catch {
+      throw new Error542(
+        `Invalid token for GitHub integration. Code: ${code}, setupAction: ${setupAction}. Token: ${token}`,
+      )
+    }
+
+    const installToken = await IntegrationService.getInstallToken(installId)
+    const repos = await getInstalledRepositories(installToken)
+    const githubOwner = IntegrationService.extractOwner(repos, this.options)
+
+    let orgAvatar
+    try {
+      const response = await request('GET /users/{user}', {
+        user: githubOwner,
+      })
+      orgAvatar = response.data.avatar_url
+    } catch (err) {
+      this.options.log.warn(err, 'Error while fetching GitHub user!')
+    }
+
+    const integration = await this.createOrUpdateGithubIntegration(
+      {
+        platform: PlatformType.GITHUB,
+        token,
+        settings: { updateMemberAttributes: true, orgAvatar },
+        integrationIdentifier: installId,
+        status: 'mapping',
+      },
+      repos,
+    )
+
+    return integration
+  }
+
+  async connectGithubInstallation(installId: string) {
+    const installToken = await IntegrationService.getInstallToken(installId)
+    const repos = await getInstalledRepositories(installToken)
+    const githubOwner = IntegrationService.extractOwner(repos, this.options)
+
+    let orgAvatar
+    try {
+      const response = await request('GET /users/{user}', {
+        user: githubOwner,
+      })
+      orgAvatar = response.data.avatar_url
+    } catch (err) {
+      this.options.log.warn(err, 'Error while fetching GitHub user!')
+    }
+
+    const integration = await this.createOrUpdateGithubIntegration(
+      {
+        platform: PlatformType.GITHUB,
+        token: installToken,
+        settings: { updateMemberAttributes: true, orgAvatar },
+        integrationIdentifier: installId,
+        status: 'mapping',
+      },
+      repos,
+    )
+
+    return integration
+  }
+
+  async getGithubInstallations() {
+    return GithubInstallationsRepository.getInstallations(this.options)
+  }
+
+  /**
+   * Creates or updates a GitHub integration, handling large repos data
+   * @param integrationData The integration data to create or update
+   * @param repos The repositories data
+   */
+  private async createOrUpdateGithubIntegration(integrationData, repos: Repos) {
+    let integration
+    const transaction = await SequelizeRepository.createTransaction(this.options)
+
+    try {
+      // Get the first repo's owner since we know all repos are from same installation
+      const orgName = repos[0]?.owner
+
+      // Create initial integration with org structure but empty repos
+      const initialOrg = {
+        name: orgName,
+        logo: integrationData.settings.orgAvatar,
+        url: `https://github.com/${orgName}`,
+        fullSync: true,
+        updatedAt: new Date().toISOString(),
+        repos: [],
+      }
+
+      integration = await this.createOrUpdate(
+        {
+          ...integrationData,
+          settings: {
+            ...integrationData.settings,
+            orgs: [initialOrg],
+          },
+        },
+        transaction,
+      )
+
+      await SequelizeRepository.commitTransaction(transaction)
+
+      // Transform repos into the new format
+      const transformedRepos = repos.map((repo) => ({
+        name: repo.name,
+        url: repo.url,
+        updatedAt: repo.createdAt || new Date().toISOString(),
+      }))
+
+      // Add repos in chunks
+      const chunkSize = 100 // Process 100 repos at a time
+      for (let i = 0; i < transformedRepos.length; i += chunkSize) {
+        const reposChunk = transformedRepos.slice(i, i + chunkSize)
+        await this.appendGitHubReposToOrg(integration.id, reposChunk)
+      }
+
+      return integration
+    } catch (err) {
+      await SequelizeRepository.rollbackTransaction(transaction)
+      throw err
+    }
+  }
+
+  private async appendGitHubReposToOrg(integrationId: string, repos: any[]) {
+    const transaction = await SequelizeRepository.createTransaction(this.options)
+    const sequelize = SequelizeRepository.getSequelize(this.options)
+
+    try {
+      // Append repos to the first (and only) org's repos array
+      const query = `
+        UPDATE integrations
+        SET settings = jsonb_set(
+          settings,
+          '{orgs,0,repos}',
+          COALESCE(settings->'orgs'->0->'repos', '[]'::jsonb) || ?::jsonb
+        )
+        WHERE id = ?
+      `
+
+      const values = [JSON.stringify(repos), integrationId]
+
+      await sequelize.query(query, {
+        replacements: values,
+        transaction,
+      })
+
+      await SequelizeRepository.commitTransaction(transaction)
+    } catch (error) {
+      await SequelizeRepository.rollbackTransaction(transaction)
+      throw error
+    }
+  }
+
+  async mapGithubReposSnowflake(
+    integrationId,
+    mapping,
+    fireOnboarding = true,
+    isUpdateTransaction = false,
+  ) {
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     const txOptions = {
@@ -398,7 +595,12 @@ export default class IntegrationService {
 
     try {
       const oldMapping = await GithubReposRepository.getMapping(integrationId, txOptions)
-      await GithubReposRepository.updateMapping(integrationId, mapping, oldMapping, txOptions)
+      await GithubReposRepository.updateMappingSnowflake(
+        integrationId,
+        mapping,
+        oldMapping,
+        txOptions,
+      )
 
       // add the repos to the git integration
       if (EDITION === Edition.LFX) {
@@ -607,6 +809,96 @@ export default class IntegrationService {
     }
   }
 
+  async mapGithubRepos(integrationId, mapping, fireOnboarding = true) {
+    const transaction = await SequelizeRepository.createTransaction(this.options)
+
+    const txOptions = {
+      ...this.options,
+      transaction,
+    }
+
+    try {
+      await GithubReposRepository.updateMapping(integrationId, mapping, txOptions)
+
+      // add the repos to the git integration
+      if (EDITION === Edition.LFX) {
+        const repos: Record<string, string[]> = Object.entries(mapping).reduce(
+          (acc, [url, segmentId]) => {
+            if (!acc[segmentId as string]) {
+              acc[segmentId as string] = []
+            }
+            acc[segmentId as string].push(url)
+            return acc
+          },
+          {},
+        )
+
+        for (const [segmentId, urls] of Object.entries(repos)) {
+          let isGitintegrationConfigured
+          const segmentOptions: IRepositoryOptions = {
+            ...this.options,
+            currentSegments: [
+              {
+                ...this.options.currentSegments[0],
+                id: segmentId as string,
+              },
+            ],
+          }
+          try {
+            await IntegrationRepository.findByPlatform(PlatformType.GIT, segmentOptions)
+
+            isGitintegrationConfigured = true
+          } catch (err) {
+            isGitintegrationConfigured = false
+          }
+
+          if (isGitintegrationConfigured) {
+            const gitInfo = await this.gitGetRemotes(segmentOptions)
+            const gitRemotes = gitInfo[segmentId as string].remotes
+            await this.gitConnectOrUpdate(
+              {
+                remotes: Array.from(new Set([...gitRemotes, ...urls])),
+              },
+              segmentOptions,
+            )
+          } else {
+            await this.gitConnectOrUpdate(
+              {
+                remotes: urls,
+              },
+              segmentOptions,
+            )
+          }
+        }
+      }
+
+      if (fireOnboarding) {
+        const integration = await IntegrationRepository.update(
+          integrationId,
+          { status: 'in-progress' },
+          txOptions,
+        )
+
+        this.options.log.info(
+          { tenantId: integration.tenantId },
+          'Sending GitHub message to int-run-worker!',
+        )
+        const emitter = await getIntegrationRunWorkerEmitter()
+        await emitter.triggerIntegrationRun(
+          integration.tenantId,
+          integration.platform,
+          integration.id,
+          true,
+        )
+      }
+
+      await SequelizeRepository.commitTransaction(transaction)
+    } catch (err) {
+      await SequelizeRepository.rollbackTransaction(transaction)
+      throw err
+    }
+  }
+
   async getGithubRepos(integrationId): Promise<any[]> {
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
@@ -1886,4 +2178,103 @@ export default class IntegrationService {
       throw err
     }
   }
+
+  async updateGithubIntegrationSettings(installId: string) {
+    this.options.log.info(`Updating GitHub integration settings for installId: ${installId}`)
+
+    // Find the integration by installId
+    const integration: any = await IntegrationRepository.findByIdentifier(
+      installId,
+      PlatformType.GITHUB,
+    )
+
+    if (!integration || integration.platform !== PlatformType.GITHUB) {
+      this.options.log.warn(`GitHub integration not found for installId: ${installId}`)
+      throw new Error404('GitHub integration not found')
+    }
+
+    this.options.log.info(`Found integration: ${integration.id}`)
+
+    // Get the install token
+    const installToken = await IntegrationService.getInstallToken(installId)
+    this.options.log.info(`Obtained install token for installId: ${installId}`)
+
+    // Fetch all installed repositories
+    const repos = await getInstalledRepositories(installToken)
+    this.options.log.info(`Fetched ${repos.length} installed repositories`)
+
+    // Update integration settings
+    const currentSettings: {
+      orgs: Array<{
+        name: string
+        logo: string
+        url: string
+        fullSync: boolean
+        updatedAt: string
+        repos: Array<{
+          name: string
+          url: string
+          updatedAt: string
+        }>
+      }>
+    } = integration.settings || { orgs: [] }
+
+    if (currentSettings.orgs.length !== 1) {
+      throw new Error('Integration settings must have exactly one organization')
+    }
+
+    const currentRepos = currentSettings.orgs[0].repos || []
+    const newRepos = repos.filter((repo) => !currentRepos.some((r) => r.url === repo.url))
+    this.options.log.info(`Found ${newRepos.length} new repositories`)
+
+    const updatedSettings = {
+      ...currentSettings,
+      orgs: [
+        {
+          ...currentSettings.orgs[0],
+          repos: [
+            ...currentRepos,
+            ...newRepos.map((repo) => ({
+              name: repo.name,
+              url: repo.url,
+              updatedAt: repo.updatedAt || new Date().toISOString(),
+            })),
+          ],
+        },
+      ],
+    }
+
+    this.options = {
+      ...this.options,
+      currentSegments: [
+        {
+          id: integration.segmentId,
+        } as any,
+      ],
+    }
+
+    // Update the integration with new settings
+    await this.update(integration.id, { settings: updatedSettings })
+
+    this.options.log.info(`Updated integration settings for integration id: ${integration.id}`)
+
+    // Update GitHub repos mapping
+    const defaultSegmentId = integration.segmentId
+    const mapping = {}
+    for (const repo of newRepos) {
+      mapping[repo.url] = defaultSegmentId
+    }
+    if (Object.keys(mapping).length > 0) {
+      // false - not firing onboarding
+      await this.mapGithubRepos(integration.id, mapping, false)
+      this.options.log.info(`Updated GitHub repos mapping for integration id: ${integration.id}`)
+    } else {
+      this.options.log.info(`No new repos to map for integration id: ${integration.id}`)
+    }
+
+    this.options.log.info(
+      `Completed updating GitHub integration settings for installId: ${installId}`,
+    )
+    return integration
+  }
 }
diff --git a/frontend/scripts/docker-entrypoint.sh b/frontend/scripts/docker-entrypoint.sh
index c3cea261d2..7eedb3d44f 100755
--- a/frontend/scripts/docker-entrypoint.sh
+++ b/frontend/scripts/docker-entrypoint.sh
@@ -34,6 +34,7 @@ declare -a ENV_VARIABLES=(
   "VUE_APP_DATADOG_RUM_APPLICATION_ID"
   "VUE_APP_DATADOG_RUM_CLIENT_TOKEN"
   "VUE_APP_TEAM_USER_IDS"
+  "VUE_APP_IS_GITHUB_ARCHIVE_ENABLED"
 )
 
 for ENV_VAR in "${ENV_VARIABLES[@]}"
diff --git a/frontend/src/config.js b/frontend/src/config.js
index d9e39dd61b..bce5a9019a 100644
--- a/frontend/src/config.js
+++ b/frontend/src/config.js
@@ -55,6 +55,7 @@ const defaultConfig = {
   lf: {
     tenantId: import.meta.env.VUE_APP_LF_TENANT_ID,
   },
+  isGithubArchiveEnabled: import.meta.env.VUE_APP_IS_GITHUB_ARCHIVE_ENABLED,
   isGitEnabled: import.meta.env.VUE_APP_IS_GIT_ENABLED,
   isGroupsioEnabled: import.meta.env.VUE_APP_IS_GROUPSIO_ENABLED,
   isConfluenceEnabled: import.meta.env.VUE_APP_IS_CONFLUENCE_ENABLED,
@@ -116,6 +117,7 @@ const composedConfig = {
   lf: {
     tenantId: 'CROWD_VUE_APP_LF_TENANT_ID',
   },
+  isGithubArchiveEnabled: 'CROWD_VUE_APP_IS_GITHUB_ARCHIVE_ENABLED',
   isGitEnabled: 'CROWD_VUE_APP_IS_GIT_ENABLED',
   isGroupsioEnabled: 'CROWD_VUE_APP_IS_GROUPSIO_ENABLED',
   isTwitterEnabled: 'CROWD_VUE_APP_IS_TWITTER_ENABLED',
diff --git a/frontend/src/config/integrations/github-archive/components/connect/github-connect.vue b/frontend/src/config/integrations/github-archive/components/connect/github-connect.vue
new file mode 100644
index 0000000000..fbf455d262
--- /dev/null
+++ b/frontend/src/config/integrations/github-archive/components/connect/github-connect.vue
@@ -0,0 +1,76 @@
+<template>
+  <div>
+    <div class="flex items-center gap-4">
+      <!--      <lf-button type="secondary-ghost" class="!text-gray-500" @click="isDetailsModalOpen = true">-->
+      <!--        <lf-icon name="circle-info" type="regular" />-->
+      <!--        Details-->
+      <!--      </lf-button>-->
+      <el-tooltip
+        content="Onboarding new data for GitHub is currently disabled due to some issues we are experiencing.
+      Please contact support if you need to onboard new data or update settings."
+        placement="top"
+      >
+        <span>
+          <lf-button type="secondary" disabled @click="isConnectModalOpen = true">
+            <lf-icon name="link-simple" />
+            Connect
+          </lf-button>
+        </span>
+      </el-tooltip>
+    </div>
+    <lf-github-connect-modal
+      v-if="isConnectModalOpen"
+      v-model="isConnectModalOpen"
+    />
+    <!--    <lf-github-details-modal-->
+    <!--      v-if="isDetailsModalOpen"-->
+    <!--      v-model="isDetailsModalOpen"-->
+    <!--      @connect="isConnectModalOpen = true; isDetailsModalOpen = false;"-->
+    <!--    />-->
+    <lf-github-connect-finishing-modal v-model="isFinishingModalOpen" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import LfIcon from '@/ui-kit/icon/Icon.vue';
+import { useRoute } from 'vue-router';
+import { mapActions } from '@/shared/vuex/vuex.helpers';
+
+const route = useRoute();
+const { doGithubConnect } = mapActions('integration');
+
+const isConnectModalOpen = ref(false);
+// const isDetailsModalOpen = ref(false);
+const isFinishingModalOpen = ref(false);
+
+const finallizeGithubConnect = () => {
+  const {
+    code, source, state,
+  } = route.query;
+  const setupAction = route.query.setup_action;
+  const installId = route.query.installation_id;
+
+  if (code && !source && state !== 'noconnect') {
+    isFinishingModalOpen.value = true;
+    doGithubConnect({
+      code,
+      installId,
+      setupAction,
+    }).then(() => {
+      isFinishingModalOpen.value = false;
+    });
+  }
+};
+
+onMounted(() => {
+  finallizeGithubConnect();
+});
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubConnect',
+};
+</script>
diff --git a/frontend/src/config/integrations/github-archive/components/github-connect.vue b/frontend/src/config/integrations/github-archive/components/github-connect.vue
new file mode 100644
index 0000000000..e16b9b5279
--- /dev/null
+++ b/frontend/src/config/integrations/github-archive/components/github-connect.vue
@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <div class="flex items-center gap-4">
+      <!--      <lf-button v-if="!props.hideDetails" type="secondary-ghost" class="!text-gray-500" @click="isDetailsModalOpen = true">-->
+      <!--        <lf-icon name="circle-info" type="regular" />-->
+      <!--        Details-->
+      <!--      </lf-button>-->
+      <el-tooltip
+        content="Onboarding new data for GitHub is currently being
+        managed by the CM dev team. Please reach out in Slack (#lfx-cm) to get your project onboarded."
+        placement="top"
+        :disabled="isTeam"
+      >
+        <lf-button type="secondary" :disabled="!isTeam" @click="isSettingsDrawerOpen = true">
+          <lf-icon name="link-simple" />
+          <slot>Connect</slot>
+        </lf-button>
+      </el-tooltip>
+    </div>
+    <lf-github-settings-drawer
+      v-if="isSettingsDrawerOpen"
+      v-model="isSettingsDrawerOpen"
+      :integration="props.integration"
+      :segment-id="props.segmentId"
+      :grandparent-id="props.grandparentId"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import LfIcon from '@/ui-kit/icon/Icon.vue';
+import LfGithubSettingsDrawer from '@/config/integrations/github-archive/components/settings/github-settings-drawer.vue';
+// import { isTeamUser } from '@/config/permissions';
+// import { useAuthStore } from '@/modules/auth/store/auth.store';
+// import { storeToRefs } from 'pinia';
+
+const props = defineProps<{
+  integration: any,
+  segmentId: string | null;
+  grandparentId: string | null;
+}>();
+
+const isSettingsDrawerOpen = ref(false);
+
+const isTeam = true;
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubConnect',
+};
+</script>
diff --git a/frontend/src/config/integrations/github-archive/components/github-details-modal.vue b/frontend/src/config/integrations/github-archive/components/github-details-modal.vue
new file mode 100644
index 0000000000..29fd10c473
--- /dev/null
+++ b/frontend/src/config/integrations/github-archive/components/github-details-modal.vue
@@ -0,0 +1,112 @@
+<template>
+  <lf-modal v-model="isModalOpen" width="37.5rem">
+    <div class="px-6 pt-5 pb-6">
+      <!-- Header -->
+      <div class="flex justify-between pb-8">
+        <div class="pt-1 flex items-center gap-2">
+          <div class="border border-gray-200 rounded-md h-12 w-12 p-2">
+            <img src="/images/integrations/github.png" alt="GitHub" class="w-8 h-8 object-contain" />
+          </div>
+          <div>
+            <lf-icon name="angle-right" :size="20" class="text-gray-500" />
+          </div>
+          <div class="border border-gray-200 rounded-md h-12 w-12 p-2">
+            <img src="/images/integrations/custom/lfx.png" alt="LFX" class="w-8 h-8 object-contain" />
+          </div>
+        </div>
+        <lf-button type="secondary-ghost" icon-only @click="isModalOpen = false">
+          <lf-icon name="xmark" type="regular" />
+        </lf-button>
+      </div>
+
+      <!-- Content -->
+      <h5 class="pb-3">
+        GitHub integration
+      </h5>
+      <p class="text-small pb-6">
+        GitHub is a code hosting platform that over 80 million developers use for
+        collaboration and version control. Its one of the richest places for
+        developer activity and information.
+      </p>
+      <p class="text-small font-semibold pb-1.5">
+        Activities tracked
+      </p>
+      <p class="text-gray-600 text-small pb-3">
+        Stars/Un-stars, Forks, Issues, Pull requests, Discussions,
+        Comments on issues, Pull requests, Discussions, Closing of
+        issues/pull requests/discussions
+      </p>
+      <div class="border-t border-gray-200 pb-3" />
+      <p class="text-small font-semibold pb-1.5">
+        Historical import
+      </p>
+      <p class="text-gray-600 text-small pb-3">
+        No limitation
+      </p>
+      <div class="border-t border-gray-200 pb-3" />
+      <p class="text-small font-semibold pb-1.5">
+        Refresh period
+      </p>
+      <p class="text-gray-600 text-small pb-10">
+        Instant (maximum a few seconds)
+      </p>
+      <h6 class="pb-6">
+        How to connect
+      </h6>
+      <div class="flex pb-6">
+        <div class="w-6 h-6 rounded-full bg-gray-200 font-secondary text-center text-medium flex items-center justify-center">
+          1
+        </div>
+        <div class="pl-2">
+          <p class="text-small leading-6 font-semibold pb-0.5">
+            Select the repositories you want to track
+          </p>
+          <p class="text-tiny text-gray-500">
+            Esse et nihil ratione sit facere aut fugiat corporis et animi velit natus laudantium et.
+          </p>
+        </div>
+      </div>
+      <div class="flex pb-10">
+        <div class="w-6 h-6 rounded-full bg-gray-200 font-secondary text-center text-medium flex items-center justify-center">
+          2
+        </div>
+        <div class="pl-2">
+          <p class="text-small leading-6 font-semibold pb-0.5">
+            Map each repository with the correspondent project
+          </p>
+          <p class="text-tiny text-gray-500">
+            In vero sed libero labore voluptatem eos ut libero consequuntur dolorem aut ut similique.
+          </p>
+        </div>
+      </div>
+      <lf-button type="secondary" size="large" class="w-full" @click="emit('connect')">
+        <lf-icon name="link-simple" type="regular" />
+        Connect GitHub
+      </lf-button>
+    </div>
+  </lf-modal>
+</template>
+
+<script setup lang="ts">
+import LfModal from '@/ui-kit/modal/Modal.vue';
+import { computed } from 'vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import LfIcon from '@/ui-kit/icon/Icon.vue';
+
+const props = defineProps<{
+  modelValue: boolean,
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: boolean): void, (e: 'connect'): void }>();
+
+const isModalOpen = computed({
+  get: () => props.modelValue,
+  set: (value: boolean) => emit('update:modelValue', value),
+});
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubDetailsModal',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/github-dropdown.vue b/frontend/src/config/integrations/github-archive/components/github-dropdown.vue
similarity index 93%
rename from frontend/src/config/integrations/github/components/github-dropdown.vue
rename to frontend/src/config/integrations/github-archive/components/github-dropdown.vue
index ce508a7b96..7126c09568 100644
--- a/frontend/src/config/integrations/github/components/github-dropdown.vue
+++ b/frontend/src/config/integrations/github-archive/components/github-dropdown.vue
@@ -16,7 +16,7 @@
 import { defineProps, ref } from 'vue';
 import LfDropdownItem from '@/ui-kit/dropdown/DropdownItem.vue';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
-import LfGithubSettingsDrawer from '@/config/integrations/github/components/settings/github-settings-drawer.vue';
+import LfGithubSettingsDrawer from '@/config/integrations/github-archive/components/settings/github-settings-drawer.vue';
 
 const props = defineProps<{
   integration: any,
diff --git a/frontend/src/config/integrations/github-archive/components/github-params.vue b/frontend/src/config/integrations/github-archive/components/github-params.vue
new file mode 100644
index 0000000000..408f93b475
--- /dev/null
+++ b/frontend/src/config/integrations/github-archive/components/github-params.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="flex items-center gap-1">
+    <el-popover trigger="hover" placement="top" popper-class="!w-auto">
+      <template #reference>
+        <div
+          class="text-gray-600 text-2xs flex items-center leading-5"
+        >
+          <i
+            class="ri-git-repository-line text-base !text-gray-600 mr-1 h-4 flex items-center"
+          />
+
+          <span class="font-semibold">
+            {{ pluralize("repository", Object.keys(mappings).length, true) }}
+          </span>
+        </div>
+      </template>
+
+      <p class="text-gray-400 text-sm font-semibold mb-4">
+        GitHub repositories
+      </p>
+      <div class="-my-1 px-1 max-h-44 overflow-auto">
+        <article
+          v-for="mapping of mappings"
+          :key="mapping.url"
+          class="py-2 flex items-center flex-nowrap"
+        >
+          <i
+            class="ri-git-repository-line text-base mr-2 h-4 flex items-center"
+          />
+          <a
+            :href="mapping.url"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="text-xs leading-5 max-w-3xs truncate hover:underline !text-black"
+          >
+            /{{ repoNameFromUrl(mapping.url) }}
+          </a>
+          <div
+            class="ri-arrow-right-line text-gray-400 text-base mx-2 h-4 flex items-center"
+          />
+          <div class="text-xs leading-5 max-w-3xs truncate">
+            {{ mapping.segment.name }}
+          </div>
+        </article>
+      </div>
+    </el-popover>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { IntegrationService } from '@/modules/integration/integration-service';
+import pluralize from 'pluralize';
+
+const props = defineProps<{
+  integration: any;
+}>();
+
+const mappings = ref([]);
+
+const repoNameFromUrl = (url) => url.split('/').at(-1);
+
+onMounted(() => {
+  if (props.integration.status !== 'mapping') {
+    IntegrationService.fetchGitHubMappings(props.integration).then((res) => {
+      mappings.value = res;
+    });
+  }
+});
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubStatus',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-add-repository-modal.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-add-repository-modal.vue
similarity index 98%
rename from frontend/src/config/integrations/github/components/settings/github-settings-add-repository-modal.vue
rename to frontend/src/config/integrations/github-archive/components/settings/github-settings-add-repository-modal.vue
index 771b14d064..19ed448496 100644
--- a/frontend/src/config/integrations/github/components/settings/github-settings-add-repository-modal.vue
+++ b/frontend/src/config/integrations/github-archive/components/settings/github-settings-add-repository-modal.vue
@@ -160,8 +160,8 @@ import {
   GitHubOrganization,
   GitHubRepository,
   GitHubSettingsRepository,
-} from '@/config/integrations/github/types/GithubSettings';
-import { GithubApiService } from '@/config/integrations/github/services/github.api.service';
+} from '@/config/integrations/github-archive/types/GithubSettings';
+import { GithubApiService } from '@/config/integrations/github-archive/services/github.api.service';
 import Message from '@/shared/message/message';
 import dayjs from 'dayjs';
 
diff --git a/frontend/src/config/integrations/github-archive/components/settings/github-settings-drawer.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-drawer.vue
new file mode 100644
index 0000000000..0051b4832a
--- /dev/null
+++ b/frontend/src/config/integrations/github-archive/components/settings/github-settings-drawer.vue
@@ -0,0 +1,293 @@
+<template>
+  <lf-drawer v-model="isDrawerVisible">
+    <div class="flex flex-col justify-between h-full">
+      <section class="pt-4 px-6 pb-6 border-b border-gray-100">
+        <div class="flex justify-between pb-3">
+          <div>
+            <p class="text-tiny text-gray-500 mb-1.5">
+              Integration
+            </p>
+            <div class="flex items-center gap-2">
+              <img src="/images/integrations/github.png" alt="GitHub" class="h-6 w-6" />
+              <h5 class="text-black">
+                GitHub
+              </h5>
+            </div>
+          </div>
+          <lf-button type="secondary-ghost" icon-only @click="isDrawerVisible = false">
+            <lf-icon name="xmark" />
+          </lf-button>
+        </div>
+        <p class="text-small text-gray-500">
+          Sync GitHub repositories to track profile information and all relevant
+          activities like commits, pull requests, discussions, and more.
+        </p>
+      </section>
+      <div class="flex-grow overflow-auto">
+        <lf-github-settings-empty v-if="repositories.length === 0" @add="isAddRepositoryModalOpen = true" />
+        <div v-else class="px-6 pt-5">
+          <lf-github-settings-mapping
+            v-model:repositories="repositories"
+            v-model:organizations="organizations"
+            v-model:mappings="repoMappings"
+            :subprojects="subprojects"
+            @add="isAddRepositoryModalOpen = true"
+          />
+        </div>
+      </div>
+      <div
+        class="border-t border-gray-100 py-5 px-6 flex justify-end gap-4"
+        style="box-shadow: 0 -4px 4px 0 rgba(0, 0, 0, 0.05)"
+      >
+        <lf-button type="secondary-ghost-light" @click="isDrawerVisible = false">
+          Cancel
+        </lf-button>
+        <el-tooltip
+          content="Onboarding new data for GitHub is currently disabled due to some issues we are experiencing.
+      Please contact support if you need to onboard new data or update settings."
+          placement="top"
+          :disabled="isTeam"
+        >
+          <span>
+            <lf-button
+              type="primary"
+              :disabled="!isTeam || $v.$invalid || !repositories.length || props.integration?.status === 'in-progress'"
+              @click="connect()"
+            >
+              {{ props.integration ? "Update settings" : "Connect" }}
+            </lf-button>
+          </span>
+        </el-tooltip>
+      </div>
+    </div>
+  </lf-drawer>
+  <lf-github-settings-add-repository-modal
+    v-if="isAddRepositoryModalOpen"
+    v-model="isAddRepositoryModalOpen"
+    v-model:organizations="organizations"
+    v-model:repositories="repositories"
+    :integration="props.integration"
+  />
+</template>
+
+<script lang="ts" setup>
+import {
+  computed, onMounted, ref, watch,
+} from 'vue';
+import LfDrawer from '@/ui-kit/drawer/Drawer.vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import LfIcon from '@/ui-kit/icon/Icon.vue';
+import LfGithubSettingsEmpty from '@/config/integrations/github-archive/components/settings/github-settings-empty.vue';
+import LfGithubSettingsAddRepositoryModal from '@/config/integrations/github-archive/components/settings/github-settings-add-repository-modal.vue';
+import { LfService } from '@/modules/lf/segments/lf-segments-service';
+import useVuelidate from '@vuelidate/core';
+import { Integration } from '@/modules/admin/modules/integration/types/Integration';
+import {
+  GitHubOrganization,
+  GitHubSettings,
+  GitHubSettingsOrganization,
+  GitHubSettingsRepository,
+} from '@/config/integrations/github-archive/types/GithubSettings';
+import LfGithubSettingsMapping from '@/config/integrations/github-archive/components/settings/github-settings-mapping.vue';
+import dayjs from 'dayjs';
+import { IntegrationService } from '@/modules/integration/integration-service';
+import Message from '@/shared/message/message';
+import { mapActions } from '@/shared/vuex/vuex.helpers';
+import useProductTracking from '@/shared/modules/monitoring/useProductTracking';
+import {
+  EventType,
+  FeatureEventKey,
+} from '@/shared/modules/monitoring/types/event';
+import { Platform } from '@/shared/modules/platform/types/Platform';
+import { showIntegrationProgressNotification } from '@/modules/integration/helpers/integration-progress-notification';
+import { isTeamUser } from '@/config/permissions';
+import { storeToRefs } from 'pinia';
+import { useAuthStore } from '@/modules/auth/store/auth.store';
+
+const props = defineProps<{
+  modelValue: boolean;
+  integration?: Integration<GitHubSettings>;
+  segmentId: string | null;
+  grandparentId: string | null;
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: boolean): void }>();
+
+const { doFetch } = mapActions('integration');
+const { trackEvent } = useProductTracking();
+const { user } = storeToRefs(useAuthStore());
+
+const isAddRepositoryModalOpen = ref(false);
+
+const subprojects = ref([]);
+const organizations = ref<GitHubOrganization[]>([]);
+const repositories = ref<GitHubSettingsRepository[]>([]);
+const repoMappings = ref<Record<string, string>>({});
+const initialRepoMappings = ref<Record<string, string>>({});
+
+// Drawer visibility
+const isDrawerVisible = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(val) {
+    emit('update:modelValue', val);
+  },
+});
+
+const fetchSubProjects = () => {
+  LfService.findSegment(props.grandparentId).then((segment) => {
+    subprojects.value = segment.projects.map((p) => p.subprojects).flat();
+  });
+};
+
+const $v = useVuelidate();
+
+const isTeam = computed(() => isTeamUser(user.value));
+
+const allOrganizations = computed<any[]>(() => {
+  const owners = new Set();
+  return repositories.value.reduce((acc: any[], r) => {
+    if (!owners.has(r.org!.name)) {
+      owners.add(r.org!.name);
+      acc.push(r.org!);
+    }
+    return acc;
+  }, []);
+});
+
+const buildSettings = (): GitHubSettings => {
+  const orgs = allOrganizations.value.map(
+    (o: GitHubOrganization): GitHubSettingsOrganization => ({
+      ...o,
+      fullSync: organizations.value.some((org) => org.url === o.url),
+      updatedAt: o.updatedAt || dayjs().toISOString(),
+      repos: repositories.value
+        .filter((r) => r.org!.url === o.url)
+        .map((r) => ({
+          name: r.name,
+          url: r.url,
+          updatedAt: (props.integration
+            && repoMappings.value[r.url] !== initialRepoMappings.value[r.url])
+            ? dayjs().toISOString()
+            : r.updatedAt || dayjs().toISOString(),
+        })),
+    }),
+  );
+  return { orgs, updateMemberAttributes: true };
+};
+
+const connect = () => {
+  let integration: any = null;
+  const settings: GitHubSettings = buildSettings();
+
+  (props.integration?.id
+    ? IntegrationService.update(props.integration.id, {
+      settings,
+    }, [props.segmentId])
+    : IntegrationService.create({
+      settings,
+      platform: 'github',
+      status: 'in-progress',
+    }, [props.segmentId])
+  )
+    .then((res) => {
+      integration = res;
+      return IntegrationService.githubMapRepos(res.id, repoMappings.value, [
+        res.segmentId,
+      ], !!props.integration?.id);
+    })
+    .then(() => {
+      doFetch([integration.segmentId]);
+
+      trackEvent({
+        key: FeatureEventKey.CONNECT_INTEGRATION,
+        type: EventType.FEATURE,
+        properties: {
+          integration: Platform.GITHUB,
+        },
+      });
+
+      if (integration.status === 'in-progress') {
+        showIntegrationProgressNotification('github', integration.segmentId);
+      } else {
+        Message.success(
+          props.integration?.id
+            ? 'Settings have been updated'
+            : 'GitHub has been connected successfully',
+        );
+      }
+
+      isDrawerVisible.value = false;
+    })
+    .catch(() => {
+      Message.error(
+        props.integration?.id
+          ? 'There was error updating settings'
+          : 'There was error connecting GitHub',
+      );
+    });
+};
+
+const fetchGithubMappings = () => {
+  if (!props.integration) return;
+  IntegrationService.fetchGitHubMappings(props.integration).then(
+    (res: any[]) => {
+      const mappings = res.reduce(
+        (rm, mapping) => ({
+          ...rm,
+          [mapping.url]: mapping.segment.id,
+        }),
+        {},
+      );
+      // Create new objects to ensure no reference sharing
+      repoMappings.value = { ...mappings };
+      initialRepoMappings.value = { ...mappings };
+    },
+  );
+};
+
+watch(
+  () => props.integration,
+  (value?: Integration<GitHubSettings>) => {
+    if (value) {
+      fetchGithubMappings();
+      const { orgs } = value.settings;
+      organizations.value = orgs
+        .filter((o) => o.fullSync)
+        .map((o) => ({
+          name: o.name,
+          logo: o.logo,
+          url: o.url,
+          updatedAt: o.updatedAt,
+        }));
+      repositories.value = orgs.reduce(
+        (acc: GitHubSettingsRepository[], o) => [
+          ...acc,
+          ...o.repos.map((r) => ({
+            ...r,
+            org: {
+              name: o.name,
+              logo: o.logo,
+              url: o.url,
+              updatedAt: o.updatedAt,
+            },
+          })),
+        ],
+        [],
+      );
+    }
+  },
+  { immediate: true },
+);
+
+onMounted(() => {
+  fetchSubProjects();
+});
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubSettingsDrawer',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-empty.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-empty.vue
similarity index 100%
rename from frontend/src/config/integrations/github/components/settings/github-settings-empty.vue
rename to frontend/src/config/integrations/github-archive/components/settings/github-settings-empty.vue
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-mapping.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-mapping.vue
similarity index 93%
rename from frontend/src/config/integrations/github/components/settings/github-settings-mapping.vue
rename to frontend/src/config/integrations/github-archive/components/settings/github-settings-mapping.vue
index 7b996026aa..07463dbea1 100644
--- a/frontend/src/config/integrations/github/components/settings/github-settings-mapping.vue
+++ b/frontend/src/config/integrations/github-archive/components/settings/github-settings-mapping.vue
@@ -73,14 +73,14 @@ import LfIcon from '@/ui-kit/icon/Icon.vue';
 import { computed, ref } from 'vue';
 import LfSearch from '@/ui-kit/search/Search.vue';
 import LfGithubSettingsRepositoriesBulkSelect
-  from '@/config/integrations/github/components/settings/github-settings-repositories-bulk-select.vue';
+  from '@/config/integrations/github-archive/components/settings/github-settings-repositories-bulk-select.vue';
 import {
   GitHubOrganization,
   GitHubSettingsRepository,
-} from '@/config/integrations/github/types/GithubSettings';
-import LfGithubSettingsOrgItem from '@/config/integrations/github/components/settings/github-settings-org-item.vue';
+} from '@/config/integrations/github-archive/types/GithubSettings';
+import LfGithubSettingsOrgItem from '@/config/integrations/github-archive/components/settings/github-settings-org-item.vue';
 import LfTable from '@/ui-kit/table/Table.vue';
-import LfGithubSettingsRepoItem from '@/config/integrations/github/components/settings/github-settings-repo-item.vue';
+import LfGithubSettingsRepoItem from '@/config/integrations/github-archive/components/settings/github-settings-repo-item.vue';
 import LfIconOld from '@/ui-kit/icon/IconOld.vue';
 
 const props = defineProps<{
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-org-item.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-org-item.vue
similarity index 96%
rename from frontend/src/config/integrations/github/components/settings/github-settings-org-item.vue
rename to frontend/src/config/integrations/github-archive/components/settings/github-settings-org-item.vue
index a3412a6f8d..7828b191eb 100644
--- a/frontend/src/config/integrations/github/components/settings/github-settings-org-item.vue
+++ b/frontend/src/config/integrations/github-archive/components/settings/github-settings-org-item.vue
@@ -68,7 +68,7 @@ import {
   GitHubOrganization,
   GitHubRepository,
   GitHubSettingsRepository,
-} from '@/config/integrations/github/types/GithubSettings';
+} from '@/config/integrations/github-archive/types/GithubSettings';
 import LfAvatar from '@/ui-kit/avatar/Avatar.vue';
 import LfIconOld from '@/ui-kit/icon/IconOld.vue';
 import LfButton from '@/ui-kit/button/Button.vue';
@@ -78,7 +78,7 @@ import { computed } from 'vue';
 import LfDropdown from '@/ui-kit/dropdown/Dropdown.vue';
 import LfDropdownItem from '@/ui-kit/dropdown/DropdownItem.vue';
 import dayjs from 'dayjs';
-import { GithubApiService } from '@/config/integrations/github/services/github.api.service';
+import { GithubApiService } from '@/config/integrations/github-archive/services/github.api.service';
 
 const props = defineProps<{
   organizations: GitHubOrganization[];
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-repo-item.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-repo-item.vue
similarity index 97%
rename from frontend/src/config/integrations/github/components/settings/github-settings-repo-item.vue
rename to frontend/src/config/integrations/github-archive/components/settings/github-settings-repo-item.vue
index 22e0a3d719..b3e9785f26 100644
--- a/frontend/src/config/integrations/github/components/settings/github-settings-repo-item.vue
+++ b/frontend/src/config/integrations/github-archive/components/settings/github-settings-repo-item.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script lang="ts" setup>
-import { GitHubRepository } from '@/config/integrations/github/types/GithubSettings';
+import { GitHubRepository } from '@/config/integrations/github-archive/types/GithubSettings';
 import { computed, watch } from 'vue';
 import LfIconOld from '@/ui-kit/icon/IconOld.vue';
 import AppFormItem from '@/shared/form/form-item.vue';
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-repositories-bulk-select.vue b/frontend/src/config/integrations/github-archive/components/settings/github-settings-repositories-bulk-select.vue
similarity index 100%
rename from frontend/src/config/integrations/github/components/settings/github-settings-repositories-bulk-select.vue
rename to frontend/src/config/integrations/github-archive/components/settings/github-settings-repositories-bulk-select.vue
diff --git a/frontend/src/config/integrations/github-archive/config.ts b/frontend/src/config/integrations/github-archive/config.ts
new file mode 100644
index 0000000000..ef0a6854f0
--- /dev/null
+++ b/frontend/src/config/integrations/github-archive/config.ts
@@ -0,0 +1,16 @@
+import { IntegrationConfig } from '@/config/integrations';
+import GithubConnect from './components/github-connect.vue';
+import GithubParams from './components/github-params.vue';
+import GithubDropdown from './components/github-dropdown.vue';
+
+const github: IntegrationConfig = {
+  key: 'github',
+  name: 'GitHub',
+  image: '/images/integrations/github.png',
+  description: 'Connect GitHub to sync profile information, stars, forks, pull requests, issues, and discussions.',
+  connectComponent: GithubConnect,
+  dropdownComponent: GithubDropdown,
+  connectedParamsComponent: GithubParams,
+};
+
+export default github;
diff --git a/frontend/src/config/integrations/github/services/github.api.service.ts b/frontend/src/config/integrations/github-archive/services/github.api.service.ts
similarity index 94%
rename from frontend/src/config/integrations/github/services/github.api.service.ts
rename to frontend/src/config/integrations/github-archive/services/github.api.service.ts
index ecae7b8c13..8328553db8 100644
--- a/frontend/src/config/integrations/github/services/github.api.service.ts
+++ b/frontend/src/config/integrations/github-archive/services/github.api.service.ts
@@ -1,5 +1,5 @@
 import authAxios from '@/shared/axios/auth-axios';
-import { GitHubOrganization, GitHubRepository } from '@/config/integrations/github/types/GithubSettings';
+import { GitHubOrganization, GitHubRepository } from '@/config/integrations/github-archive/types/GithubSettings';
 
 export class GithubApiService {
   static async searchRepositories(query: string): Promise<GitHubRepository[]> {
diff --git a/frontend/src/config/integrations/github/types/GithubSettings.ts b/frontend/src/config/integrations/github-archive/types/GithubSettings.ts
similarity index 100%
rename from frontend/src/config/integrations/github/types/GithubSettings.ts
rename to frontend/src/config/integrations/github-archive/types/GithubSettings.ts
diff --git a/frontend/src/config/integrations/github/components/connect/github-connect-finishing-modal.vue b/frontend/src/config/integrations/github/components/connect/github-connect-finishing-modal.vue
new file mode 100644
index 0000000000..17a33517fa
--- /dev/null
+++ b/frontend/src/config/integrations/github/components/connect/github-connect-finishing-modal.vue
@@ -0,0 +1,38 @@
+<template>
+  <lf-modal v-model="isModalOpen" width="25rem">
+    <div class="p-6">
+      <div class="flex items-center gap-2">
+        <h5>Finishing the setup</h5>
+        <lf-spinner size="1.25rem" />
+      </div>
+      <p class="text-small pt-3 text-gray-500">
+        We're finishing the last steps of the
+        <span class="font-semibold">GitHub</span> <br />
+        integration setup, please don't reload the page.
+      </p>
+    </div>
+  </lf-modal>
+</template>
+
+<script setup lang="ts">
+import LfModal from '@/ui-kit/modal/Modal.vue';
+import LfSpinner from '@/ui-kit/spinner/Spinner.vue';
+import { computed } from 'vue';
+
+const props = defineProps<{
+  modelValue: boolean;
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: boolean) }>();
+
+const isModalOpen = computed<boolean>({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value),
+});
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubConnectFinishingModal',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/connect/github-connect-modal.vue b/frontend/src/config/integrations/github/components/connect/github-connect-modal.vue
new file mode 100644
index 0000000000..0d5b574025
--- /dev/null
+++ b/frontend/src/config/integrations/github/components/connect/github-connect-modal.vue
@@ -0,0 +1,221 @@
+<template>
+  <lf-modal v-model="isModalOpen" width="40rem">
+    <div class="p-6">
+      <div class="flex justify-between">
+        <!-- icon -->
+        <div class="bg-primary-50 h-10 w-10 flex justify-center items-center rounded-full">
+          <lf-icon-old name="git-repository-private-line" :size="24" class="text-primary-500" />
+        </div>
+
+        <!-- close button -->
+        <lf-button
+          type="secondary-ghost-light"
+          size="large"
+          :icon-only="true"
+          class="-mt-2 -mr-2"
+          @click="isModalOpen = false"
+        >
+          <lf-icon-old name="close-line" :size="24" />
+        </lf-button>
+      </div>
+      <section class="pt-6 pb-8">
+        <h5 class="pb-2">
+          Connect your GitHub organization
+        </h5>
+        <p class="text-medium text-gray-600">
+          Choose the organization and repositories you want to connect with your project.
+        </p>
+      </section>
+      <section class="mb-7 border border-gray-200 rounded-lg p-5">
+        <h6 class="pb-2">
+          I'm the GitHub organization admin
+        </h6>
+        <p class="text-medium text-gray-600 pb-6">
+          As an admin member of the organization you want to connect,
+          you can give access to Community Management and select the repositories you want to track.
+        </p>
+        <lf-button type="primary" class="w-full" @click="openGithubInstallation">
+          Choose organization to connect
+        </lf-button>
+      </section>
+      <section class="border border-gray-200 rounded-lg p-5">
+        <article class="mb-8">
+          <h6 class="pb-2">
+            I'm not the admin of the GitHub organization
+          </h6>
+          <p class="text-medium text-gray-600">
+            Request the installation of Community Management App from an admin member.
+          </p>
+        </article>
+        <article class="flex mb-8">
+          <div class="min-w-8 w-8 h-8 flex items-center justify-center rounded-full bg-gray-200">
+            <h6>1</h6>
+          </div>
+          <div class="pl-3">
+            <p class="text-medium text-gray-600 pb-3">
+              Share the <span class="font-semibold">Community Management App</span> installation link
+              with an admin member of your GitHub organization.
+            </p>
+            <lf-button type="primary-link" size="small" @click="copy()">
+              <template v-if="!copied">
+                <lf-icon-old name="file-copy-line" />
+                Copy app installation link to clipboard
+              </template>
+              <template v-else>
+                <lf-icon-old name="checkbox-circle-fill" class="text-green-500" />
+                <span class="text-green-500">Copied to clipboard!</span>
+              </template>
+            </lf-button>
+          </div>
+        </article>
+        <article class="flex mb-6">
+          <div class="min-w-8 w-8 h-8 flex items-center justify-center rounded-full bg-gray-200">
+            <h6>2</h6>
+          </div>
+          <div class="pl-3">
+            <p class="text-medium text-gray-600 pb-3">
+              Once the app is installed, you will be able to select the organization you want to connect.
+              Type the organization name in order to proceed.
+            </p>
+          </div>
+        </article>
+        <article>
+          <el-select
+            v-model="installationId"
+            placeholder="Enter organization name..."
+            class="w-full mb-4"
+            filterable
+            :filter-method="(query: string) => search = query"
+            no-data-text="Type to search"
+            clearable
+            :automatic-dropdown="false"
+            :popper-class="search.length ? '' : 'hidden'"
+          >
+            <template v-if="selectedInstallation" #prefix>
+              <lf-avatar
+                :src="selectedInstallation.avatarUrl"
+                :name="selectedInstallation.login"
+                :size="18"
+                class="!rounded border border-gray-200 mr-1 mt-px"
+              >
+                <template #placeholder>
+                  <div class="w-full h-full bg-gray-50 flex items-center justify-center">
+                    <lf-icon-old name="community-line" :size="14" class="text-gray-400" />
+                  </div>
+                </template>
+              </lf-avatar>
+            </template>
+            <el-option
+              v-for="i of filteredInstallations"
+              :key="i.installationId"
+              :value="i.installationId"
+              :label="i.login"
+              class="!px-3"
+            >
+              <div class="flex items-center gap-2">
+                <lf-avatar :src="i.avatarUrl" :name="i.login" :size="18" class="!rounded border border-gray-200 mr-1 mt-px">
+                  <template #placeholder>
+                    <div class="w-full h-full bg-gray-50 flex items-center justify-center">
+                      <lf-icon-old name="community-line" :size="14" class="text-gray-400" />
+                    </div>
+                  </template>
+                </lf-avatar>
+                <p>{{ i.login }}</p>
+              </div>
+            </el-option>
+          </el-select>
+
+          <lf-button class="w-full" :disabled="!installationId.length" @click="connectInstallation">
+            Connect organization
+          </lf-button>
+        </article>
+      </section>
+    </div>
+  </lf-modal>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import LfModal from '@/ui-kit/modal/Modal.vue';
+import config from '@/config';
+import LfIconOld from '@/ui-kit/icon/IconOld.vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import LfAvatar from '@/ui-kit/avatar/Avatar.vue';
+import { IntegrationService } from '@/modules/integration/integration-service';
+import { mapActions } from '@/shared/vuex/vuex.helpers';
+
+interface GithubInstallation {
+  id: string;
+  installationId: string;
+  type: string;
+  numRepos: number;
+  login: string;
+  avatarUrl: string;
+}
+
+const props = defineProps<{
+  modelValue: boolean,
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: boolean): void }>();
+
+const { doFetch } = mapActions('integration');
+const copied = ref(false);
+const installations = ref<GithubInstallation[]>([]);
+const installationId = ref<string>('');
+const search = ref<string>('');
+
+const isModalOpen = computed({
+  get: () => props.modelValue,
+  set: (value: boolean) => emit('update:modelValue', value),
+});
+
+const filteredInstallations = computed(() => (search.value.length
+  ? installations.value.filter((i) => i.login.toLowerCase().startsWith(search.value.toLowerCase()))
+  : []));
+
+const selectedInstallation = computed(() => installations.value.find((i) => i.installationId === installationId.value));
+
+const openGithubInstallation = () => window.open(config.gitHubInstallationUrl, '_self');
+
+const copy = () => {
+  if (navigator.clipboard) {
+    const urlWithState = `${config.gitHubInstallationUrl}?state=noconnect`;
+    navigator.clipboard.writeText(urlWithState);
+    copied.value = true;
+    setTimeout(() => {
+      copied.value = false;
+    }, 1000);
+  }
+};
+
+const connectInstallation = () => {
+  if (!installationId.value) {
+    return;
+  }
+
+  IntegrationService.githubConnectInstallation(installationId.value)
+    .then(() => {
+      isModalOpen.value = false;
+      doFetch();
+    });
+};
+
+const getGithubInstallations = () => {
+  IntegrationService.getGithubInstallations()
+    .then((res: GithubInstallation[]) => {
+      installations.value = res;
+      console.log(res);
+    });
+};
+
+onMounted(() => {
+  getGithubInstallations();
+});
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubConnectModal',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/connect/github-connect.vue b/frontend/src/config/integrations/github/components/connect/github-connect.vue
index fbf455d262..bb6a355448 100644
--- a/frontend/src/config/integrations/github/components/connect/github-connect.vue
+++ b/frontend/src/config/integrations/github/components/connect/github-connect.vue
@@ -5,18 +5,10 @@
       <!--        <lf-icon name="circle-info" type="regular" />-->
       <!--        Details-->
       <!--      </lf-button>-->
-      <el-tooltip
-        content="Onboarding new data for GitHub is currently disabled due to some issues we are experiencing.
-      Please contact support if you need to onboard new data or update settings."
-        placement="top"
-      >
-        <span>
-          <lf-button type="secondary" disabled @click="isConnectModalOpen = true">
-            <lf-icon name="link-simple" />
-            Connect
-          </lf-button>
-        </span>
-      </el-tooltip>
+      <lf-button type="secondary" @click="isConnectModalOpen = true">
+        <lf-icon name="link-simple" />
+        Connect
+      </lf-button>
     </div>
     <lf-github-connect-modal
       v-if="isConnectModalOpen"
@@ -37,6 +29,10 @@ import LfButton from '@/ui-kit/button/Button.vue';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
 import { useRoute } from 'vue-router';
 import { mapActions } from '@/shared/vuex/vuex.helpers';
+import LfGithubConnectFinishingModal
+  from '@/config/integrations/github/components/connect/github-connect-finishing-modal.vue';
+// import LfGithubDetailsModal from '@/config/integrations/github/components/github-details-modal.vue';
+import LfGithubConnectModal from './github-connect-modal.vue';
 
 const route = useRoute();
 const { doGithubConnect } = mapActions('integration');
diff --git a/frontend/src/config/integrations/github/components/github-action.vue b/frontend/src/config/integrations/github/components/github-action.vue
new file mode 100644
index 0000000000..a661f18b09
--- /dev/null
+++ b/frontend/src/config/integrations/github/components/github-action.vue
@@ -0,0 +1,30 @@
+<template>
+  <lf-button v-if="isMapping" type="secondary" @click="isSettingsDrawerOpen = true">
+    Map repositories
+  </lf-button>
+  <app-github-settings-drawer
+    v-if="isSettingsDrawerOpen"
+    v-model="isSettingsDrawerOpen"
+    :integration="props.integration"
+  />
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import AppGithubSettingsDrawer from '@/config/integrations/github/components/settings/github-settings-drawer.vue';
+
+const props = defineProps<{
+  integration: any;
+}>();
+
+const isMapping = computed(() => props.integration.status === 'mapping');
+
+const isSettingsDrawerOpen = ref(props.integration.status === 'mapping');
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubAction',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/github-status.vue b/frontend/src/config/integrations/github/components/github-status.vue
new file mode 100644
index 0000000000..66d2b9d4af
--- /dev/null
+++ b/frontend/src/config/integrations/github/components/github-status.vue
@@ -0,0 +1,23 @@
+<template>
+  <div
+    v-if="props.integration?.status === 'mapping'"
+    class="flex items-center gap-1"
+  >
+    <lf-icon-old name="git-repository-line" :size="16" />
+    Mapping repositories...
+  </div>
+</template>
+
+<script setup lang="ts">
+import LfIconOld from '@/ui-kit/icon/IconOld.vue';
+
+const props = defineProps<{
+  integration: any;
+}>();
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfGithubStatus',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-bulk-select.vue b/frontend/src/config/integrations/github/components/settings/github-settings-bulk-select.vue
new file mode 100644
index 0000000000..4028814ac8
--- /dev/null
+++ b/frontend/src/config/integrations/github/components/settings/github-settings-bulk-select.vue
@@ -0,0 +1,147 @@
+<template>
+  <app-dialog v-model="isModalVisible" title="Bulk selection">
+    <template #content>
+      <div class="px-6">
+        <article class="pb-3">
+          <p class="text-sm font-medium text-black mb-1">
+            Repositories
+          </p>
+          <el-select
+            v-model="form.repositories"
+            placeholder="Select option(s)"
+            class="w-full"
+            placement="bottom-end"
+            filterable
+            multiple
+            :teleported="false"
+          >
+            <el-option
+              value="all"
+              label="All repositories"
+              @click="form.repositories = ['all']"
+            />
+            <el-option
+              v-for="repo of props.repositories"
+              :key="repo.url"
+              :value="repo.url"
+              :label="repo.name"
+              @click="isAll ? form.repositories = form.repositories.filter((r) => r !== 'all') : null"
+            />
+          </el-select>
+        </article>
+        <article class="pb-8">
+          <p class="text-sm font-medium text-black mb-1">
+            Map with
+          </p>
+          <el-select
+            v-model="form.subproject"
+            placeholder="Select sub-project"
+            class="w-full"
+            placement="bottom-end"
+            filterable
+            :teleported="false"
+          >
+            <el-option
+              v-for="subproject of props.subprojects"
+              :key="subproject.id"
+              :value="subproject.id"
+              :label="subproject.name"
+            />
+          </el-select>
+        </article>
+      </div>
+      <div class="bg-gray-50 px-6 py-4 flex items-center justify-end gap-4">
+        <el-button
+          class="btn btn--md btn--bordered"
+          @click="isModalVisible = false; reset()"
+        >
+          Cancel
+        </el-button>
+        <lf-button
+          type="primary"
+          :disabled="$v.$invalid"
+          @click="mapRepos()"
+        >
+          <span>
+            Map repositories <span v-if="form.repositories.length > 0">({{ isAll ? props.repositories.length : form.repositories.length }})</span>
+          </span>
+        </lf-button>
+      </div>
+    </template>
+  </app-dialog>
+</template>
+
+<script lang="ts" setup>
+import {
+  computed, reactive,
+} from 'vue';
+import AppDialog from '@/shared/dialog/dialog.vue';
+import LfButton from '@/ui-kit/button/Button.vue';
+import { required } from '@vuelidate/validators';
+import useVuelidate from '@vuelidate/core';
+
+const props = defineProps<{
+  modelValue: boolean,
+  repositories: any[],
+  subprojects: any[],
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: boolean): void, (e: 'apply', value: Record<string, string>): void }>();
+
+// Modal visibility
+const isModalVisible = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(val) {
+    emit('update:modelValue', val);
+  },
+});
+
+const form = reactive<{
+  subproject: string;
+  repositories: string[]
+}>({
+  subproject: '',
+  repositories: [],
+});
+
+const rules = {
+  subproject: {
+    required,
+  },
+  repositories: {
+    required,
+  },
+};
+
+const $v = useVuelidate(rules, form, { $stopPropagation: true });
+
+const isAll = computed<boolean>(() => form.repositories.includes('all'));
+
+const reset = () => {
+  form.subproject = '';
+  form.repositories = [];
+  $v.value.$reset();
+};
+
+const mapRepos = () => {
+  let repos = form.repositories;
+  if (isAll.value) {
+    repos = props.repositories.map((r) => r.url);
+  }
+  const data = repos.reduce((mapping, url) => ({
+    ...mapping,
+    [url]: form.subproject,
+  }), {});
+  emit('apply', data);
+  reset();
+  isModalVisible.value = false;
+};
+</script>
+
+<script lang="ts">
+export default {
+  name: 'AppGithubSettingsBulkSelect',
+};
+</script>
diff --git a/frontend/src/config/integrations/github/components/settings/github-settings-drawer.vue b/frontend/src/config/integrations/github/components/settings/github-settings-drawer.vue
index 402322270d..1b1da42452 100644
--- a/frontend/src/config/integrations/github/components/settings/github-settings-drawer.vue
+++ b/frontend/src/config/integrations/github/components/settings/github-settings-drawer.vue
@@ -1,129 +1,200 @@
 <template>
-  <lf-drawer v-model="isDrawerVisible">
-    <div class="flex flex-col justify-between h-full">
-      <section class="pt-4 px-6 pb-6 border-b border-gray-100">
-        <div class="flex justify-between pb-3">
-          <div>
-            <p class="text-tiny text-gray-500 mb-1.5">
-              Integration
+  <app-drawer
+    v-model="isDrawerVisible"
+    title="GitHub"
+    size="600px"
+    pre-title="Integration"
+    :show-footer="true"
+    has-border
+    @close="isDrawerVisible = false"
+  >
+    <template #beforeTitle>
+      <img
+        :src="githubDetails.image"
+        class="w-6 h-6 mr-2"
+        alt="GitHub logo"
+      />
+    </template>
+    <template #content>
+      <div>
+        <!-- Connected organization info -->
+        <section v-if="owner" class="border border-gray-200 rounded-md py-4 px-5 mb-6">
+          <p class="text-2xs font-medium text-gray-400 mb-1">
+            Connected organization
+          </p>
+          <div class="flex items-center">
+            <div v-if="owner.logo" class="h-5 w-5 rounded border border-gray-200 mr-2">
+              <img :src="owner.logo" class="object-cover" :alt="owner.logo">
+            </div>
+            <p class="text-xs font-medium leading-5">
+              {{ owner.name }}
+            </p>
+          </div>
+        </section>
+
+        <!-- Disclaimer -->
+        <section class="pb-4">
+          <div class="pb-4">
+            <div class="flex justify-between items-center">
+              <h6 class="text-sm font-medium leading-5 mb-2">
+                Repository mapping
+              </h6>
+              <div class="flex items-center text-primary-500 cursor-pointer select-none" @click="isBulkSelectOpened = true">
+                <i class="ri-checkbox-multiple-line text-base mr-1" />
+                <span class="text-xs font-normal">
+                  Bulk selection
+                </span>
+              </div>
+            </div>
+            <p class="text-2xs leading-4.5 text-gray-500">
+              Select the subproject you want to map with each connected repository.
             </p>
-            <div class="flex items-center gap-2">
-              <img src="/images/integrations/github.png" alt="GitHub" class="h-6 w-6" />
-              <h5 class="text-black">
-                GitHub
-              </h5>
+          </div>
+          <div class="border border-yellow-100 rounded-md bg-yellow-50 p-2 flex">
+            <div class="w-4 h-4 flex items-center ri-alert-fill text-yellow-500" />
+            <div class="flex-grow text-yellow-900 text-2xs leading-4.5 pl-2">
+              Repository mapping is not reversible. Once GitHub is connected,
+              you won’t be able to update these settings and reconnecting a different organization or repositories won’t override past activities.
             </div>
           </div>
-          <lf-button type="secondary-ghost" icon-only @click="isDrawerVisible = false">
-            <lf-icon name="xmark" />
-          </lf-button>
-        </div>
-        <p class="text-small text-gray-500">
-          Sync GitHub repositories to track profile information and all relevant
-          activities like commits, pull requests, discussions, and more.
-        </p>
-      </section>
-      <div class="flex-grow overflow-auto">
-        <lf-github-settings-empty v-if="repositories.length === 0" @add="isAddRepositoryModalOpen = true" />
-        <div v-else class="px-6 pt-5">
-          <lf-github-settings-mapping
-            v-model:repositories="repositories"
-            v-model:organizations="organizations"
-            v-model:mappings="repoMappings"
-            :subprojects="subprojects"
-            @add="isAddRepositoryModalOpen = true"
-          />
-        </div>
+        </section>
+
+        <section class="pb-4">
+          <el-input
+            v-model="search"
+            clearable
+            placeholder="Search repositories..."
+          >
+            <template #prefix>
+              <i class="ri-search-line text-gray-400" />
+            </template>
+          </el-input>
+        </section>
+
+        <!-- Repository mapping -->
+        <section v-if="filteredRepos.length > 0">
+          <div class="flex border-b border-gray-200 items-center h-8">
+            <div class="w-1/2 pr-4">
+              <p class="text-3xs uppercase text-gray-400 font-semibold tracking-1">
+                REPOSITORY
+              </p>
+            </div>
+            <div class="w-1/2 pr-4">
+              <p class="text-3xs uppercase text-gray-400 font-semibold tracking-1">
+                SUB-PROJECT
+              </p>
+            </div>
+          </div>
+          <div class="py-1.5">
+            <article v-for="repo of filteredRepos" :key="repo.url" class="py-1.5 flex items-center">
+              <div class="w-1/2 flex items-center pr-4">
+                <i class="ri-git-repository-line text-base mr-2" />
+                <p class="text-2xs leading-5 flex-grow truncate">
+                  /{{ repo.name }}
+                </p>
+              </div>
+              <div class="w-1/2">
+                <app-form-item
+                  :validation="$v[repo.url]"
+                  :error-messages="{
+                    required: 'This field is required',
+                  }"
+                  class="mb-0"
+                  error-class="relative top-0"
+                >
+                  <el-select
+                    v-model="form[repo.url]"
+                    placeholder="Select sub-project"
+                    class="w-full"
+                    placement="bottom-end"
+                    filterable
+                    @blur="$v[repo.url].$touch"
+                    @change="$v[repo.url].$touch"
+                  >
+                    <el-option
+                      v-for="subproject of subprojects"
+                      :key="subproject.id"
+                      :value="subproject.id"
+                      :label="subproject.name"
+                    />
+                  </el-select>
+                </app-form-item>
+              </div>
+            </article>
+          </div>
+        </section>
+        <section v-else>
+          <p class="text-center text-sm text-gray-500 mb-4">
+            No repositories found
+          </p>
+        </section>
       </div>
-      <div
-        class="border-t border-gray-100 py-5 px-6 flex justify-end gap-4"
-        style="box-shadow: 0 -4px 4px 0 rgba(0, 0, 0, 0.05)"
-      >
-        <lf-button type="secondary-ghost-light" @click="isDrawerVisible = false">
+    </template>
+
+    <template #footer>
+      <div style="flex: auto">
+        <el-button
+          class="btn btn--md btn--bordered mr-3"
+          @click="isDrawerVisible = false"
+        >
           Cancel
-        </lf-button>
-        <el-tooltip
-          content="Onboarding new data for GitHub is currently disabled due to some issues we are experiencing.
-      Please contact support if you need to onboard new data or update settings."
-          placement="top"
-          :disabled="isTeam"
+        </el-button>
+        <el-button
+          type="primary"
+          class="btn btn--md btn--primary"
+          :disabled="sending || $v.$invalid"
+          :loading="sending"
+          @click="connect()"
         >
-          <span>
-            <lf-button
-              type="primary"
-              :disabled="!isTeam || $v.$invalid || !repositories.length || props.integration?.status === 'in-progress'"
-              @click="connect()"
-            >
-              {{ props.integration ? "Update settings" : "Connect" }}
-            </lf-button>
-          </span>
-        </el-tooltip>
+          Connect
+        </el-button>
       </div>
-    </div>
-  </lf-drawer>
-  <lf-github-settings-add-repository-modal
-    v-if="isAddRepositoryModalOpen"
-    v-model="isAddRepositoryModalOpen"
-    v-model:organizations="organizations"
-    v-model:repositories="repositories"
-    :integration="props.integration"
+    </template>
+  </app-drawer>
+  <app-github-settings-bulk-select
+    v-model="isBulkSelectOpened"
+    :repositories="repos"
+    :subprojects="subprojects"
+    @apply="bulkApply"
   />
 </template>
 
 <script lang="ts" setup>
 import {
-  computed, onMounted, ref, watch,
+  computed, onMounted,
+  ref,
 } from 'vue';
-import LfDrawer from '@/ui-kit/drawer/Drawer.vue';
-import LfButton from '@/ui-kit/button/Button.vue';
-import LfIcon from '@/ui-kit/icon/Icon.vue';
-import LfGithubSettingsEmpty from '@/config/integrations/github/components/settings/github-settings-empty.vue';
-import LfGithubSettingsAddRepositoryModal from '@/config/integrations/github/components/settings/github-settings-add-repository-modal.vue';
+import Message from '@/shared/message/message';
+import { CrowdIntegrations } from '@/integrations/integrations-config';
 import { LfService } from '@/modules/lf/segments/lf-segments-service';
+import { useRoute, useRouter } from 'vue-router';
+import { required } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
-import { Integration } from '@/modules/admin/modules/integration/types/Integration';
-import {
-  GitHubOrganization,
-  GitHubSettings,
-  GitHubSettingsOrganization,
-  GitHubSettingsRepository,
-} from '@/config/integrations/github/types/GithubSettings';
-import LfGithubSettingsMapping from '@/config/integrations/github/components/settings/github-settings-mapping.vue';
-import dayjs from 'dayjs';
+import AppFormItem from '@/shared/form/form-item.vue';
 import { IntegrationService } from '@/modules/integration/integration-service';
-import Message from '@/shared/message/message';
+import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 import { mapActions } from '@/shared/vuex/vuex.helpers';
+import { showIntegrationProgressNotification } from '@/modules/integration/helpers/integration-progress-notification';
 import useProductTracking from '@/shared/modules/monitoring/useProductTracking';
-import {
-  EventType,
-  FeatureEventKey,
-} from '@/shared/modules/monitoring/types/event';
+import { EventType, FeatureEventKey } from '@/shared/modules/monitoring/types/event';
 import { Platform } from '@/shared/modules/platform/types/Platform';
-import { showIntegrationProgressNotification } from '@/modules/integration/helpers/integration-progress-notification';
-import { isTeamUser } from '@/config/permissions';
-import { storeToRefs } from 'pinia';
-import { useAuthStore } from '@/modules/auth/store/auth.store';
+import AppGithubSettingsBulkSelect
+  from '@/config/integrations/github/components/settings/github-settings-bulk-select.vue';
 
 const props = defineProps<{
-  modelValue: boolean;
-  integration?: Integration<GitHubSettings>;
-  segmentId: string | null;
-  grandparentId: string | null;
+  modelValue: boolean,
+  integration: any
 }>();
 
 const emit = defineEmits<{(e: 'update:modelValue', value: boolean): void }>();
 
-const { doFetch } = mapActions('integration');
 const { trackEvent } = useProductTracking();
-const { user } = storeToRefs(useAuthStore());
 
-const isAddRepositoryModalOpen = ref(false);
+const route = useRoute();
+const router = useRouter();
 
-const subprojects = ref([]);
-const organizations = ref<GitHubOrganization[]>([]);
-const repositories = ref<GitHubSettingsRepository[]>([]);
-const repoMappings = ref<Record<string, string>>({});
-const initialRepoMappings = ref<Record<string, string>>({});
+// Store
+const { doFetch } = mapActions('integration');
 
 // Drawer visibility
 const isDrawerVisible = computed({
@@ -135,159 +206,113 @@ const isDrawerVisible = computed({
   },
 });
 
-const fetchSubProjects = () => {
-  LfService.findSegment(props.grandparentId).then((segment) => {
-    subprojects.value = segment.projects.map((p) => p.subprojects).flat();
-  });
+// Search
+const search = ref('');
+
+const filteredRepos = computed(() => repos.value.filter((r: any) => r.name.toLowerCase().includes(search.value.toLowerCase())));
+
+// Bulk select
+const isBulkSelectOpened = ref<boolean>(false);
+
+const bulkApply = (data: Record<string, string>) => {
+  form.value = {
+    ...form.value,
+    ...data,
+  };
 };
 
-const $v = useVuelidate();
+// Display data
+const repos = computed(() => props.integration?.settings?.orgs[0]?.repos || []);
 
-const isTeam = computed(() => isTeamUser(user.value));
+const owner = computed<{name: string, logo?: string} | null>(() => (repos.value.length > 0 ? {
+  name: props.integration?.settings?.orgs[0]?.name,
+  logo: props.integration?.settings?.orgs[0]?.logo,
+} : null));
 
-const allOrganizations = computed<any[]>(() => {
-  const owners = new Set();
-  return repositories.value.reduce((acc: any[], r) => {
-    if (!owners.has(r.org!.name)) {
-      owners.add(r.org!.name);
-      acc.push(r.org!);
-    }
-    return acc;
-  }, []);
-});
+// Static github details
+const githubDetails = computed(() => CrowdIntegrations.getConfig('github'));
 
-const buildSettings = (): GitHubSettings => {
-  const orgs = allOrganizations.value.map(
-    (o: GitHubOrganization): GitHubSettingsOrganization => ({
-      ...o,
-      fullSync: organizations.value.some((org) => org.url === o.url),
-      updatedAt: o.updatedAt || dayjs().toISOString(),
-      repos: repositories.value
-        .filter((r) => r.org!.url === o.url)
-        .map((r) => ({
-          name: r.name,
-          url: r.url,
-          updatedAt: (props.integration
-            && repoMappings.value[r.url] !== initialRepoMappings.value[r.url])
-            ? dayjs().toISOString()
-            : r.updatedAt || dayjs().toISOString(),
-        })),
-    }),
-  );
-  return { orgs, updateMemberAttributes: true };
-};
+// Form
+const form = ref<Record<string, string>>(repos.value.reduce((a: Record<string, any>, b: any) => ({
+  ...a,
+  [b.url]: props.integration.segmentId,
+}), {}));
+
+const rules = computed(() => repos.value.reduce((a: Record<string, any>, b: any) => ({
+  ...a,
+  [b.url]: {
+    required,
+  },
+}), {}));
+
+const $v = useVuelidate(rules, form);
+
+// Connecting
+const sending = ref(false);
 
 const connect = () => {
-  let integration: any = null;
-  const settings: GitHubSettings = buildSettings();
-
-  (props.integration?.id
-    ? IntegrationService.update(props.integration.id, {
-      settings,
-    }, [props.segmentId])
-    : IntegrationService.create({
-      settings,
-      platform: 'github',
-      status: 'in-progress',
-    }, [props.segmentId])
-  )
-    .then((res) => {
-      integration = res;
-      return IntegrationService.githubMapRepos(res.id, repoMappings.value, [
-        res.segmentId,
-      ], !!props.integration?.id);
-    })
+  const data = { ...form.value };
+  ConfirmDialog({
+    type: 'warning',
+    title: 'Are you sure you want to proceed?',
+    message:
+        'Repository mapping is not reversible. Once GitHub is connected, you wont be able to update these settings.\n\n'
+        + 'Reconnecting a different organization and/or repositories won’t remove past activities. '
+        + 'In order to clean up existing data please reach out to our support team.',
+    confirmButtonText: 'Connect GitHub',
+    cancelButtonText: 'Cancel',
+    icon: 'ri-alert-fill',
+  } as any)
     .then(() => {
-      doFetch([integration.segmentId]);
-
-      trackEvent({
-        key: FeatureEventKey.CONNECT_INTEGRATION,
-        type: EventType.FEATURE,
-        properties: {
-          integration: Platform.GITHUB,
-        },
-      });
-
-      if (integration.status === 'in-progress') {
-        showIntegrationProgressNotification('github', integration.segmentId);
-      } else {
-        Message.success(
-          props.integration?.id
-            ? 'Settings have been updated'
-            : 'GitHub has been connected successfully',
-        );
-      }
-
-      isDrawerVisible.value = false;
-    })
-    .catch(() => {
-      Message.error(
-        props.integration?.id
-          ? 'There was error updating settings'
-          : 'There was error connecting GitHub',
-      );
+      IntegrationService.githubMapRepos(props.integration.id, data, [props.integration.segmentId])
+        .then(() => {
+          isDrawerVisible.value = false;
+
+          doFetch([props.integration.segmentId]);
+
+          trackEvent({
+            key: FeatureEventKey.CONNECT_INTEGRATION,
+            type: EventType.FEATURE,
+            properties: {
+              integration: Platform.GITHUB,
+            },
+          });
+
+          showIntegrationProgressNotification('github', props.integration.segmentId);
+
+          router.push({
+            name: 'integration',
+            params: {
+              id: props.integration.segmentId,
+            },
+          });
+        })
+        .catch(() => {
+          Message.error(
+            'There was an error mapping github repos',
+          );
+        });
     });
 };
 
-const fetchGithubMappings = () => {
-  if (!props.integration) return;
-  IntegrationService.fetchGitHubMappings(props.integration).then(
-    (res: any[]) => {
-      const mappings = res.reduce(
-        (rm, mapping) => ({
-          ...rm,
-          [mapping.url]: mapping.segment.id,
-        }),
-        {},
-      );
-      // Create new objects to ensure no reference sharing
-      repoMappings.value = { ...mappings };
-      initialRepoMappings.value = { ...mappings };
-    },
-  );
-};
+// Fetching subprojects
+const subprojects = ref([]);
 
-watch(
-  () => props.integration,
-  (value?: Integration<GitHubSettings>) => {
-    if (value) {
-      fetchGithubMappings();
-      const { orgs } = value.settings;
-      organizations.value = orgs
-        .filter((o) => o.fullSync)
-        .map((o) => ({
-          name: o.name,
-          logo: o.logo,
-          url: o.url,
-          updatedAt: o.updatedAt,
-        }));
-      repositories.value = orgs.reduce(
-        (acc: GitHubSettingsRepository[], o) => [
-          ...acc,
-          ...o.repos.map((r) => ({
-            ...r,
-            org: {
-              name: o.name,
-              logo: o.logo,
-              url: o.url,
-              updatedAt: o.updatedAt,
-            },
-          })),
-        ],
-        [],
-      );
-    }
-  },
-  { immediate: true },
-);
+const fetchSubProjects = () => {
+  LfService.findSegment(route.params.grandparentId)
+    .then((segment) => {
+      subprojects.value = segment.projects.map((p) => p.subprojects).flat();
+    });
+};
 
 onMounted(() => {
   fetchSubProjects();
 });
+
 </script>
 
 <script lang="ts">
 export default {
-  name: 'LfGithubSettingsDrawer',
+  name: 'AppGithubSettingsDrawer',
 };
 </script>
diff --git a/frontend/src/config/integrations/github/config.ts b/frontend/src/config/integrations/github/config.ts
index ef0a6854f0..c15137ba68 100644
--- a/frontend/src/config/integrations/github/config.ts
+++ b/frontend/src/config/integrations/github/config.ts
@@ -1,7 +1,8 @@
 import { IntegrationConfig } from '@/config/integrations';
-import GithubConnect from './components/github-connect.vue';
+import GithubConnect from './components/connect/github-connect.vue';
+import GithubStatus from './components/github-status.vue';
+import GithubAction from './components/github-action.vue';
 import GithubParams from './components/github-params.vue';
-import GithubDropdown from './components/github-dropdown.vue';
 
 const github: IntegrationConfig = {
   key: 'github',
@@ -9,7 +10,8 @@ const github: IntegrationConfig = {
   image: '/images/integrations/github.png',
   description: 'Connect GitHub to sync profile information, stars, forks, pull requests, issues, and discussions.',
   connectComponent: GithubConnect,
-  dropdownComponent: GithubDropdown,
+  statusComponent: GithubStatus,
+  actionComponent: GithubAction,
   connectedParamsComponent: GithubParams,
 };
 
diff --git a/frontend/src/config/integrations/index.ts b/frontend/src/config/integrations/index.ts
index 6d921270f6..2f7384a955 100644
--- a/frontend/src/config/integrations/index.ts
+++ b/frontend/src/config/integrations/index.ts
@@ -1,4 +1,6 @@
+import config from '@/config';
 import github from './github/config';
+import githubArchive from './github-archive/config';
 import git from './git/config';
 import groupsio from './groupsio/config';
 import confluence from './confluence/config';
@@ -28,7 +30,7 @@ export interface IntegrationConfig {
 }
 
 export const lfIntegrations: Record<string, IntegrationConfig> = {
-  github,
+  github: config.isGithubArchiveEnabled === 'true' ? githubArchive : github,
   git,
   groupsio,
   confluence,
diff --git a/frontend/src/modules/integration/integration-service.js b/frontend/src/modules/integration/integration-service.js
index 5117577c24..0c232484e6 100644
--- a/frontend/src/modules/integration/integration-service.js
+++ b/frontend/src/modules/integration/integration-service.js
@@ -482,7 +482,7 @@ export class IntegrationService {
 
   static async githubConnectInstallation(installId) {
     const response = await authAxios.post(
-      '/github-connect-installation',
+      '/integration/github-connect-installation',
       {
         installId,
         ...getSegments(),
@@ -494,7 +494,7 @@ export class IntegrationService {
 
   static async getGithubInstallations() {
     const response = await authAxios.get(
-      '/github-installations',
+      '/integration/github-installations',
       {
         params: getSegments(),
       },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5e3343a8b6..90de0b5ed9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1920,9 +1920,9 @@ packages:
     resolution: {integrity: sha512-P5d7hSgM2PMkYU4yomh6PE23eRj2sXQjMWh/gSSq2hyroJHPXFvx17C8zNfTTTrJ4xvc3fdYm6KS2iwXimwQZQ==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/client-s3@3.726.1':
-    resolution: {integrity: sha512-UpOGcob87DiuS2d3fW6vDZg94g57mNiOSkzvR/6GOdvBSlUgk8LLwVzGASB71FdKMl1EGEr4MeD5uKH9JsG+dw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-s3@3.689.0':
+    resolution: {integrity: sha512-qYD1GJEPeLM6H3x8BuAAMXZltvVce5vGiwtZc9uMkBBo3HyFnmPitIPTPfaD1q8LOn/7KFdkY4MJ4e8D3YpV9g==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/client-sqs@3.564.0':
     resolution: {integrity: sha512-597lRdhqkS4xIwKnvrt7mB2cJzxBL7joJhLj0ZAo9MycK5MBhyaBsWU/1CGlZlWuuSRXtt6y/MBEJmdXSm5MPQ==}
@@ -1938,11 +1938,11 @@ packages:
     resolution: {integrity: sha512-S6C/S6xYesDakEuzYvlY1DMMKLtKQxdbbygq3hfeG2R0jUt9KpRLsQXK8qrBuVCKa3WcnjN/30hp4g/iUWFU/w==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sso-oidc@3.726.0':
-    resolution: {integrity: sha512-5JzTX9jwev7+y2Jkzjz0pd1wobB5JQfPOQF3N2DrJ5Pao0/k6uRYwE4NqB0p0HlGrMTDm7xNq7OSPPIPG575Jw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-sso-oidc@3.687.0':
+    resolution: {integrity: sha512-Rdd8kLeTeh+L5ZuG4WQnWgYgdv7NorytKdZsGjiag1D8Wv3PcJvPqqWdgnI0Og717BSXVoaTYaN34FyqFYSx6Q==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.726.0
+      '@aws-sdk/client-sts': ^3.687.0
 
   '@aws-sdk/client-sso@3.556.0':
     resolution: {integrity: sha512-unXdWS7uvHqCcOyC1de+Fr8m3F2vMg2m24GPea0bg7rVGTYmiyn9mhUX11VCt+ozydrw+F50FQwL6OqoqPocmw==}
@@ -1952,9 +1952,9 @@ packages:
     resolution: {integrity: sha512-S+xhScao5MD79AkrcHmFpEDk+CgoiuB/31WFcTcnrTio5TOUONAaT0QyscOIwRp7BZ7Aez7TBM+loTteJ+TQvg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sso@3.726.0':
-    resolution: {integrity: sha512-NM5pjv2qglEc4XN3nnDqtqGsSGv1k5YTmzDo3W3pObItHmpS8grSeNfX9zSH+aVl0Q8hE4ZIgvTPNZ+GzwVlqg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-sso@3.687.0':
+    resolution: {integrity: sha512-dfj0y9fQyX4kFill/ZG0BqBTLQILKlL7+O5M4F9xlsh2WNuV2St6WtcOg14Y1j5UODPJiJs//pO+mD1lihT5Kw==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/client-sts@3.556.0':
     resolution: {integrity: sha512-TsK3js7Suh9xEmC886aY+bv0KdLLYtzrcmVt6sJ/W6EnDXYQhBuKYFhp03NrN2+vSvMGpqJwR62DyfKe1G0QzQ==}
@@ -1966,9 +1966,9 @@ packages:
     resolution: {integrity: sha512-jCQuH2qkbWoSY4wckLSfzf3OPh7zc7ZckEbIGGVUQar/JVff6EIbpQ+uNG29DDEOpdPPd8rrJsVuUlA/nvJdXA==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sts@3.726.1':
-    resolution: {integrity: sha512-qh9Q9Vu1hrM/wMBOBIaskwnE4GTFaZu26Q6WHwyWNfj7J8a40vBxpW16c2vYXHLBtwRKM1be8uRLkmDwghpiNw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-sts@3.687.0':
+    resolution: {integrity: sha512-SQjDH8O4XCTtouuCVYggB0cCCrIaTzUZIkgJUpOsIEJBLlTbNOb/BZqUShAQw2o9vxr2rCeOGjAQOYPysW/Pmg==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/core@3.556.0':
     resolution: {integrity: sha512-vJaSaHw2kPQlo11j/Rzuz0gk1tEaKdz+2ser0f0qZ5vwFlANjt08m/frU17ctnVKC1s58bxpctO/1P894fHLrA==}
@@ -1978,9 +1978,9 @@ packages:
     resolution: {integrity: sha512-DBmf94qfN0dfaLl5EnNcq6TakWfOtVXYifHoTbX+VBwESj3rlY4W+W4mAnvBgAqDjlLFy7bBljmx+vnjnV73lg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/core@3.723.0':
-    resolution: {integrity: sha512-UraXNmvqj3vScSsTkjMwQkhei30BhXlW5WxX6JacMKVtl95c7z0qOXquTWeTalYkFfulfdirUhvSZrl+hcyqTw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/core@3.686.0':
+    resolution: {integrity: sha512-Xt3DV4DnAT3v2WURwzTxWQK34Ew+iiLzoUoguvLaZrVMFOqMMrwVjP+sizqIaHp1j7rGmFcN5I8saXnsDLuQLA==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/credential-provider-env@3.535.0':
     resolution: {integrity: sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA==}
@@ -1990,9 +1990,9 @@ packages:
     resolution: {integrity: sha512-MVTQoZwPnP1Ev5A7LG+KzeU6sCB8BcGkZeDT1z1V5Wt7GPq0MgFQTSSjhImnB9jqRSZkl1079Bt3PbO6lfIS8g==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-env@3.723.0':
-    resolution: {integrity: sha512-OuH2yULYUHTVDUotBoP/9AEUIJPn81GQ/YBtZLoo2QyezRJ2QiO/1epVtbJlhNZRwXrToLEDmQGA2QfC8c7pbA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-env@3.686.0':
+    resolution: {integrity: sha512-osD7lPO8OREkgxPiTWmA1i6XEmOth1uW9HWWj/+A2YGCj1G/t2sHu931w4Qj9NWHYZtbTTXQYVRg+TErALV7nQ==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/credential-provider-http@3.552.0':
     resolution: {integrity: sha512-vsmu7Cz1i45pFEqzVb4JcFmAmVnWFNLsGheZc8SCptlqCO5voETrZZILHYIl4cjKkSDk3pblBOf0PhyjqWW6WQ==}
@@ -2002,9 +2002,9 @@ packages:
     resolution: {integrity: sha512-gL0NlyI2eW17hnCrh45hZV+qjtBquB+Bckiip9R6DIVRKqYcoILyiFhuOgf2bXeF23gVh6j18pvUvIoTaFWs5w==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-http@3.723.0':
-    resolution: {integrity: sha512-DTsKC6xo/kz/ZSs1IcdbQMTgiYbpGTGEd83kngFc1bzmw7AmK92DBZKNZpumf8R/UfSpTcj9zzUUmrWz1kD0eQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-http@3.686.0':
+    resolution: {integrity: sha512-xyGAD/f3vR/wssUiZrNFWQWXZvI4zRm2wpHhoHA1cC2fbRMNFYtFn365yw6dU7l00ZLcdFB1H119AYIUZS7xbw==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/credential-provider-ini@3.564.0':
     resolution: {integrity: sha512-kiEfBoKRcbX7I/rjhVGJrTUQ0895ANhPu6KE1GRZW7wc1gIGgKGJ+0tvAqRtQjYX0U9pivEDb0dh16OF9PBFFw==}
@@ -2016,11 +2016,11 @@ packages:
     peerDependencies:
       '@aws-sdk/client-sts': 3.572.0
 
-  '@aws-sdk/credential-provider-ini@3.726.0':
-    resolution: {integrity: sha512-seTtcKL2+gZX6yK1QRPr5mDJIBOatrpoyrO8D5b8plYtV/PDbDW3mtDJSWFHet29G61ZmlNElyXRqQCXn9WX+A==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-ini@3.687.0':
+    resolution: {integrity: sha512-6d5ZJeZch+ZosJccksN0PuXv7OSnYEmanGCnbhUqmUSz9uaVX6knZZfHCZJRgNcfSqg9QC0zsFA/51W5HCUqSQ==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.726.0
+      '@aws-sdk/client-sts': ^3.687.0
 
   '@aws-sdk/credential-provider-node@3.564.0':
     resolution: {integrity: sha512-HXD5ZCXzfcd6cJ/pW8frh8DuYlKaCd/JKmwzuCRUxgxZwbLEeNmyRYvF+D7osETJJZ4VIwgVbpEw1yLqRz1onw==}
@@ -2030,9 +2030,9 @@ packages:
     resolution: {integrity: sha512-anlYZnpmVkfp9Gan+LcEkQvmRf/m0KcbR11th8sBEyI5lxMaHKXhnAtC/hEGT7e3L6rgNOrFYTPuSvllITD/Pg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-node@3.726.0':
-    resolution: {integrity: sha512-jjsewBcw/uLi24x8JbnuDjJad4VA9ROCE94uVRbEnGmUEsds75FWOKp3fWZLQlmjLtzsIbJOZLALkZP86liPaw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-node@3.687.0':
+    resolution: {integrity: sha512-Pqld8Nx11NYaBUrVk3bYiGGpLCxkz8iTONlpQWoVWFhSOzlO7zloNOaYbD2XgFjjqhjlKzE91drs/f41uGeCTA==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/credential-provider-process@3.535.0':
     resolution: {integrity: sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA==}
@@ -2042,9 +2042,9 @@ packages:
     resolution: {integrity: sha512-hXcOytf0BadSm/MMy7MV8mmY0+Jv3mkavsHNBx0R82hw5ollD0I3JyOAaCtdUpztF0I72F8K+q8SpJQZ+EwArw==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-process@3.723.0':
-    resolution: {integrity: sha512-fgupvUjz1+jeoCBA7GMv0L6xEk92IN6VdF4YcFhsgRHlHvNgm7ayaoKQg7pz2JAAhG/3jPX6fp0ASNy+xOhmPA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-process@3.686.0':
+    resolution: {integrity: sha512-sXqaAgyzMOc+dm4CnzAR5Q6S9OWVHyZjLfW6IQkmGjqeQXmZl24c4E82+w64C+CTkJrFLzH1VNOYp1Hy5gE6Qw==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/credential-provider-sso@3.564.0':
     resolution: {integrity: sha512-Wv0NV8tDwtydEpsp/kVZ22Z+40bsSBDYgYZ1Uxx+KR8a1PvT6B5FnEtccWTJ371sQG/uqLum7dXSbJq1Qqze1w==}
@@ -2054,9 +2054,9 @@ packages:
     resolution: {integrity: sha512-iIlnpJiDXFp3XC4hJNSiNurnU24mr3iLB3HoNa9efr944bo6XBl9FQdk3NssIkqzSmgyoB2CEUx/daBHz4XSow==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-sso@3.726.0':
-    resolution: {integrity: sha512-WxkN76WeB08j2yw7jUH9yCMPxmT9eBFd9ZA/aACG7yzOIlsz7gvG3P2FQ0tVg25GHM0E4PdU3p/ByTOawzcOAg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-sso@3.687.0':
+    resolution: {integrity: sha512-N1YCoE7DovIRF2ReyRrA4PZzF0WNi4ObPwdQQkVxhvSm7PwjbWxrfq7rpYB+6YB1Uq3QPzgVwUFONE36rdpxUQ==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/credential-provider-web-identity@3.556.0':
     resolution: {integrity: sha512-R/YAL8Uh8i+dzVjzMnbcWLIGeeRi2mioHVGnVF+minmaIkCiQMZg2HPrdlKm49El+RljT28Nl5YHRuiqzEIwMA==}
@@ -2068,28 +2068,28 @@ packages:
     peerDependencies:
       '@aws-sdk/client-sts': ^3.568.0
 
-  '@aws-sdk/credential-provider-web-identity@3.723.0':
-    resolution: {integrity: sha512-tl7pojbFbr3qLcOE6xWaNCf1zEfZrIdSJtOPeSXfV/thFMMAvIjgf3YN6Zo1a6cxGee8zrV/C8PgOH33n+Ev/A==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-web-identity@3.686.0':
+    resolution: {integrity: sha512-40UqCpPxyHCXDP7CGd9JIOZDgDZf+u1OyLaGBpjQJlz1HYuEsIWnnbTe29Yg3Ah/Zc3g4NBWcUdlGVotlnpnDg==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.723.0
+      '@aws-sdk/client-sts': ^3.686.0
 
   '@aws-sdk/hash-node@3.374.0':
     resolution: {integrity: sha512-5GmU64bwoQhkebMv7NzHa+Mw+p7ZmrKz9e3A6hKClxVGeZFE/+jME46gMuFYzO0iz3WqX4CCzUVOhNbS0x8EMQ==}
     engines: {node: '>=14.0.0'}
     deprecated: This package has moved to @smithy/hash-node
 
-  '@aws-sdk/middleware-bucket-endpoint@3.726.0':
-    resolution: {integrity: sha512-vpaP80rZqwu0C3ELayIcRIW84/nd1tadeoqllT+N9TDshuEvq4UJ+w47OBHB7RkHFJoc79lXXNYle0fdQdaE/A==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-bucket-endpoint@3.686.0':
+    resolution: {integrity: sha512-6qCoWI73/HDzQE745MHQUYz46cAQxHCgy1You8MZQX9vHAQwqBnkcsb2hGp7S6fnQY5bNsiZkMWVQ/LVd2MNjg==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-expect-continue@3.723.0':
-    resolution: {integrity: sha512-w/O0EkIzkiqvGu7U8Ke7tue0V0HYM5dZQrz6nVU+R8T2LddWJ+njEIHU4Wh8aHPLQXdZA5NQumv0xLPdEutykw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-expect-continue@3.686.0':
+    resolution: {integrity: sha512-5yYqIbyhLhH29vn4sHiTj7sU6GttvLMk3XwCmBXjo2k2j3zHqFUwh9RyFGF9VY6Z392Drf/E/cl+qOGypwULpg==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-flexible-checksums@3.723.0':
-    resolution: {integrity: sha512-JY76mrUCLa0FHeMZp8X9+KK6uEuZaRZaQrlgq6zkXX/3udukH0T3YdFC+Y9uw5ddbiwZ5+KwgmlhnPpiXKfP4g==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-flexible-checksums@3.689.0':
+    resolution: {integrity: sha512-6VxMOf3mgmAgg6SMagwKj5pAe+putcx2F2odOAWviLcobFpdM/xK9vNry7p6kY+RDNmSlBvcji9wnU59fjV74Q==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/middleware-host-header@3.535.0':
     resolution: {integrity: sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew==}
@@ -2099,13 +2099,13 @@ packages:
     resolution: {integrity: sha512-zQHHj2N3in9duKghH7AuRNrOMLnKhW6lnmb7dznou068DJtDr76w475sHp2TF0XELsOGENbbBsOlN/S5QBFBVQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-host-header@3.723.0':
-    resolution: {integrity: sha512-LLVzLvk299pd7v4jN9yOSaWDZDfH0SnBPb6q+FDPaOCMGBY8kuwQso7e/ozIKSmZHRMGO3IZrflasHM+rI+2YQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-host-header@3.686.0':
+    resolution: {integrity: sha512-+Yc6rO02z+yhFbHmRZGvEw1vmzf/ifS9a4aBjJGeVVU+ZxaUvnk+IUZWrj4YQopUQ+bSujmMUzJLXSkbDq7yuw==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-location-constraint@3.723.0':
-    resolution: {integrity: sha512-inp9tyrdRWjGOMu1rzli8i2gTo0P4X6L7nNRXNTKfyPNZcBimZ4H0H1B671JofSI5isaklVy5r4pvv2VjjLSHw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-location-constraint@3.686.0':
+    resolution: {integrity: sha512-pCLeZzt5zUGY3NbW4J/5x3kaHyJEji4yqtoQcUlJmkoEInhSxJ0OE8sTxAfyL3nIOF4yr6L2xdaLCqYgQT8Aog==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/middleware-logger@3.535.0':
     resolution: {integrity: sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A==}
@@ -2115,9 +2115,9 @@ packages:
     resolution: {integrity: sha512-BinH72RG7K3DHHC1/tCulocFv+ZlQ9SrPF9zYT0T1OT95JXuHhB7fH8gEABrc6DAtOdJJh2fgxQjPy5tzPtsrA==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-logger@3.723.0':
-    resolution: {integrity: sha512-chASQfDG5NJ8s5smydOEnNK7N0gDMyuPbx7dYYcm1t/PKtnVfvWF+DHCTrRC2Ej76gLJVCVizlAJKM8v8Kg3cg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-logger@3.686.0':
+    resolution: {integrity: sha512-cX43ODfA2+SPdX7VRxu6gXk4t4bdVJ9pkktbfnkE5t27OlwNfvSGGhnHrQL8xTOFeyQ+3T+oowf26gf1OI+vIg==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/middleware-recursion-detection@3.535.0':
     resolution: {integrity: sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw==}
@@ -2127,25 +2127,25 @@ packages:
     resolution: {integrity: sha512-rFk3QhdT4IL6O/UWHmNdjJiURutBCy+ogGqaNHf/RELxgXH3KmYorLwCe0eFb5hq8f6vr3zl4/iH7YtsUOuo1w==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-recursion-detection@3.723.0':
-    resolution: {integrity: sha512-7usZMtoynT9/jxL/rkuDOFQ0C2mhXl4yCm67Rg7GNTstl67u7w5WN1aIRImMeztaKlw8ExjoTyo6WTs1Kceh7A==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-recursion-detection@3.686.0':
+    resolution: {integrity: sha512-jF9hQ162xLgp9zZ/3w5RUNhmwVnXDBlABEUX8jCgzaFpaa742qR/KKtjjZQ6jMbQnP+8fOCSXFAVNMU+s6v81w==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/middleware-sdk-s3@3.556.0':
     resolution: {integrity: sha512-4W/dnxqj1B6/uS/5Z+3UHaqDDGjNPgEVlqf5d3ToOFZ31ZfpANwhcCmyX39JklC4aolCEi9renQ5wHnTCC8K8g==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/middleware-sdk-s3@3.723.0':
-    resolution: {integrity: sha512-wfjOvNJVp8LDWhq4wO5jtSMb8Vgf4tNlR7QTEQfoYc6AGU3WlK5xyUQcpfcpwytEhQTN9u0cJLQpSyXDO+qSCw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-sdk-s3@3.687.0':
+    resolution: {integrity: sha512-YGHYqiyRiNNucmvLrfx3QxIkjSDWR/+cc72bn0lPvqFUQBRHZgmYQLxVYrVZSmRzzkH2FQ1HsZcXhOafLbq4vQ==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/middleware-sdk-sqs@3.552.0':
     resolution: {integrity: sha512-s3xy3FJSj5Bpxfk8o48SQ8DCDqZ03V3nlpblrFpCbOfdMFkxkdFkTE3F+bx+uAL+iFfW46lHvsukTb95AZJzZQ==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/middleware-ssec@3.723.0':
-    resolution: {integrity: sha512-Bs+8RAeSMik6ZYCGSDJzJieGsDDh2fRbh1HQG94T8kpwBXVxMYihm6e9Xp2cyl+w9fyyCnh0IdCKChP/DvrdhA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-ssec@3.686.0':
+    resolution: {integrity: sha512-zJXml/CpVHFUdlGQqja87vNQ3rPB5SlDbfdwxlj1KBbjnRRwpBtxxmOlWRShg8lnVV6aIMGv95QmpIFy4ayqnQ==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/middleware-user-agent@3.540.0':
     resolution: {integrity: sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ==}
@@ -2155,9 +2155,9 @@ packages:
     resolution: {integrity: sha512-R4bBbLp1ywtF1kJoOX1juDMztKPWeQHNj6XuTvtruFDn1RdfnBlbM3+9rguRfH5s4V+xfl8SSWchnyo2cI00xg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-user-agent@3.726.0':
-    resolution: {integrity: sha512-hZvzuE5S0JmFie1r68K2wQvJbzyxJFdzltj9skgnnwdvLe8F/tz7MqLkm28uV0m4jeHk0LpiBo6eZaPkQiwsZQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-user-agent@3.687.0':
+    resolution: {integrity: sha512-nUgsKiEinyA50CaDXojAkOasAU3Apdg7Qox6IjNUC4ZjgOu7QWsCDB5N28AYMUt06cNYeYQdfMX1aEzG85a1Mg==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/node-http-handler@3.374.0':
     resolution: {integrity: sha512-v1Z6m0wwkf65/tKuhwrtPRqVoOtNkDTRn2MBMtxCwEw+8V8Q+YRFqVgGN+J1n53ktE0G5OYVBux/NHiAjJHReQ==}
@@ -2177,9 +2177,9 @@ packages:
     resolution: {integrity: sha512-xkZMIxek44F4YW5r9otD1O5Y/kDkgAb6JNJePkP1qPVojrkCmin3OFYAOZgGm+T4DZAQ5rWhpaqTAWmnRumYfw==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/region-config-resolver@3.723.0':
-    resolution: {integrity: sha512-tGF/Cvch3uQjZIj34LY2mg8M2Dr4kYG8VU8Yd0dFnB1ybOEOveIK/9ypUo9ycZpB9oO6q01KRe5ijBaxNueUQg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/region-config-resolver@3.686.0':
+    resolution: {integrity: sha512-6zXD3bSD8tcsMAVVwO1gO7rI1uy2fCD3czgawuPGPopeLiPpo6/3FoUWCQzk2nvEhj7p9Z4BbjwZGSlRkVrXTw==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/s3-request-presigner@3.564.0':
     resolution: {integrity: sha512-SLsh0pIYeFqzyG5VBdBM8mtXUsj1ZF2TTA1XABb/gP6WGthePVmDkKklmsmhIyJs91DxwrU6X2HH1d6RFYwQ9A==}
@@ -2189,9 +2189,9 @@ packages:
     resolution: {integrity: sha512-bWDSK0ggK7QzAOmPZGv29UAIZocL1MNY7XyOvm3P3P1U3tFMoIBilQQBLabXyHoZ9J3Ik0Vv4n95htUhRQ35ow==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/signature-v4-multi-region@3.723.0':
-    resolution: {integrity: sha512-lJlVAa5Sl589qO8lwMLVUtnlF1Q7I+6k1Iomv2goY9d1bRl4q2N5Pit2qJVr2AMW0sceQXeh23i2a/CKOqVAdg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/signature-v4-multi-region@3.687.0':
+    resolution: {integrity: sha512-vdOQHCRHJPX9mT8BM6xOseazHD6NodvHl9cyF5UjNtLn+gERRJEItIA9hf0hlt62odGD8Fqp+rFRuqdmbNkcNw==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/token-providers@3.564.0':
     resolution: {integrity: sha512-Kk5ixcl9HjqwzfBJZGQAtsqwKa7Z8P7Mdug837BG8zCJbhf7wwNsmItzXTiAlpVrDZyT8P1yWIxsLOS1YUtmow==}
@@ -2203,11 +2203,11 @@ packages:
     peerDependencies:
       '@aws-sdk/client-sso-oidc': 3.572.0
 
-  '@aws-sdk/token-providers@3.723.0':
-    resolution: {integrity: sha512-hniWi1x4JHVwKElANh9afKIMUhAutHVBRD8zo6usr0PAoj+Waf220+1ULS74GXtLXAPCiNXl5Og+PHA7xT8ElQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/token-providers@3.686.0':
+    resolution: {integrity: sha512-9oL4kTCSePFmyKPskibeiOXV6qavPZ63/kXM9Wh9V6dTSvBtLeNnMxqGvENGKJcTdIgtoqyqA6ET9u0PJ5IRIg==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sso-oidc': ^3.723.0
+      '@aws-sdk/client-sso-oidc': ^3.686.0
 
   '@aws-sdk/types@3.535.0':
     resolution: {integrity: sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg==}
@@ -2217,9 +2217,9 @@ packages:
     resolution: {integrity: sha512-JBznu45cdgQb8+T/Zab7WpBmfEAh77gsk99xuF4biIb2Sw1mdseONdoGDjEJX57a25TzIv/WUJ2oABWumckz1A==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/types@3.723.0':
-    resolution: {integrity: sha512-LmK3kwiMZG1y5g3LGihT9mNkeNOmwEyPk6HGcJqh0wOSV4QpWoKu2epyKE4MLQNUUlz2kOVbVbOrwmI6ZcteuA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/types@3.686.0':
+    resolution: {integrity: sha512-xFnrb3wxOoJcW2Xrh63ZgFo5buIu9DF7bOHnwoUxHdNpUXicUh0AHw85TjXxyxIAd0d1psY/DU7QHoNI3OswgQ==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/url-parser@3.374.0':
     resolution: {integrity: sha512-RC3yEj4iqw5vbCmR4IQ3rhmFQilwHtWO1mZ9kRTUxfJCge3TVlrZzj9PRW3hxlYKdu3xZjSvCgX3ip8SFKXtbw==}
@@ -2229,9 +2229,9 @@ packages:
     resolution: {integrity: sha512-smVo29nUPAOprp8Z5Y3GHuhiOtw6c8/EtLCm5AVMtRsTPw4V414ZXL2H66tzmb5kEeSzQlbfBSBEdIFZoxO9kg==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/util-arn-parser@3.723.0':
-    resolution: {integrity: sha512-ZhEfvUwNliOQROcAk34WJWVYTlTa4694kSVhDSjW6lE1bMataPnIN8A0ycukEzBXmd8ZSoBcQLn6lKGl7XIJ5w==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/util-arn-parser@3.679.0':
+    resolution: {integrity: sha512-CwzEbU8R8rq9bqUFryO50RFBlkfufV9UfMArHPWlo+lmsC+NlSluHQALoj6Jkq3zf5ppn1CN0c1DDLrEqdQUXg==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/util-endpoints@3.540.0':
     resolution: {integrity: sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw==}
@@ -2241,9 +2241,9 @@ packages:
     resolution: {integrity: sha512-AIEC7ItIWBqkJLtqcSd0HG8tvdh3zVwqnKPHNrcfFay0Xonqx3p/qTCDwGosh5CM5hDGzyOSRA5PkacEDBTz9w==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/util-endpoints@3.726.0':
-    resolution: {integrity: sha512-sLd30ASsPMoPn3XBK50oe/bkpJ4N8Bpb7SbhoxcY3Lk+fSASaWxbbXE81nbvCnkxrZCvkPOiDHzJCp1E2im71A==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/util-endpoints@3.686.0':
+    resolution: {integrity: sha512-7msZE2oYl+6QYeeRBjlDgxQUhq/XRky3cXE0FqLFs2muLS7XSuQEXkpOXB3R782ygAP6JX0kmBxPTLurRTikZg==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/util-format-url@3.535.0':
     resolution: {integrity: sha512-ElbNkm0bddu53CuW44Iuux1ZbTV50fydbSh/4ypW3LrmUvHx193ogj0HXQ7X26kmmo9rXcsrLdM92yIeTjidVg==}
@@ -2259,8 +2259,8 @@ packages:
   '@aws-sdk/util-user-agent-browser@3.567.0':
     resolution: {integrity: sha512-cqP0uXtZ7m7hRysf3fRyJwcY1jCgQTpJy7BHB5VpsE7DXlXHD5+Ur5L42CY7UrRPrB6lc6YGFqaAOs5ghMcLyA==}
 
-  '@aws-sdk/util-user-agent-browser@3.723.0':
-    resolution: {integrity: sha512-Wh9I6j2jLhNFq6fmXydIpqD1WyQLyTfSxjW9B+PXSnPyk3jtQW8AKQur7p97rO8LAUzVI0bv8kb3ZzDEVbquIg==}
+  '@aws-sdk/util-user-agent-browser@3.686.0':
+    resolution: {integrity: sha512-YiQXeGYZegF1b7B2GOR61orhgv79qmI0z7+Agm3NXLO6hGfVV3kFUJbXnjtH1BgWo5hbZYW7HQ2omGb3dnb6Lg==}
 
   '@aws-sdk/util-user-agent-node@3.535.0':
     resolution: {integrity: sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ==}
@@ -2280,9 +2280,9 @@ packages:
       aws-crt:
         optional: true
 
-  '@aws-sdk/util-user-agent-node@3.726.0':
-    resolution: {integrity: sha512-iEj6KX9o6IQf23oziorveRqyzyclWai95oZHDJtYav3fvLJKStwSjygO4xSF7ycHcTYeCHSLO1FFOHgGVs4Viw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/util-user-agent-node@3.687.0':
+    resolution: {integrity: sha512-idkP6ojSTZ4ek1pJ8wIN7r9U3KR5dn0IkJn3KQBXQ58LWjkRqLtft2vxzdsktWwhPKjjmIKl1S0kbvqLawf8XQ==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
     peerDependenciesMeta:
@@ -2292,9 +2292,9 @@ packages:
   '@aws-sdk/util-utf8-browser@3.259.0':
     resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
 
-  '@aws-sdk/xml-builder@3.723.0':
-    resolution: {integrity: sha512-5xK2SqGU1mzzsOeemy7cy3fGKxR1sEpUs4pEiIjaT0OIvU+fZaDVUEYWOqsgns6wI90XZEQJlXtI8uAHX/do5Q==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/xml-builder@3.686.0':
+    resolution: {integrity: sha512-k0z5b5dkYSuOHY0AOZ4iyjcGBeVL9lWsQNF4+c+1oK3OW4fRWl/bNa1soMRMpangsHPzgyn/QkzuDbl7qR4qrw==}
+    engines: {node: '>=16.0.0'}
 
   '@azure/abort-controller@1.1.0':
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
@@ -2308,10 +2308,10 @@ packages:
     resolution: {integrity: sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==}
     engines: {node: '>=18.0.0'}
 
-  '@azure/core-http@3.0.5':
-    resolution: {integrity: sha512-T8r2q/c3DxNu6mEJfPuJtptUVqwchxzjj32gKcnMi06rdiVONS9rar7kT9T2Am+XvER7uOzpsP79WsqNbdgdWg==}
-    engines: {node: '>=18.0.0'}
-    deprecated: This package is no longer supported. Please refer to https://github.com/Azure/azure-sdk-for-js/blob/490ce4dfc5b98ba290dee3b33a6d0876c5f138e2/sdk/core/README.md
+  '@azure/core-http@3.0.4':
+    resolution: {integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==}
+    engines: {node: '>=14.0.0'}
+    deprecated: This package is no longer supported. Please migrate to use @azure/core-rest-pipeline
 
   '@azure/core-lro@2.7.2':
     resolution: {integrity: sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw==}
@@ -3217,8 +3217,8 @@ packages:
     resolution: {integrity: sha512-3t5UF3SZ14Bw2kcBHubCai6EIugU2GnQOstYWVSFuoO8IJ94RAaIOPq/dtexvQbUTpBTAGpd5smVR9WPL1mJVw==}
     engines: {node: '>=10'}
 
-  '@google-cloud/storage@7.15.0':
-    resolution: {integrity: sha512-/j/+8DFuEOo33fbdX0V5wjooOoFahEaMEdImHBmM2tH9MPHJYNtmXOf2sGUmZmiufSukmBEvdlzYgDkkgeBiVQ==}
+  '@google-cloud/storage@7.14.0':
+    resolution: {integrity: sha512-H41bPL2cMfSi4EEnFzKvg7XSb7T67ocSXrmF7MPjfgFB0L6CKGzfIYJheAZi1iqXjz6XaCT1OBf6HCG5vDBTOQ==}
     engines: {node: '>=14'}
 
   '@grpc/grpc-js@1.11.3':
@@ -3586,91 +3586,86 @@ packages:
     resolution: {integrity: sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/abort-controller@4.0.1':
-    resolution: {integrity: sha512-fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/abort-controller@3.1.6':
+    resolution: {integrity: sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/chunked-blob-reader-native@4.0.0':
-    resolution: {integrity: sha512-R9wM2yPmfEMsUmlMlIgSzOyICs0x9uu7UTHoccMyt7BWw8shcGM8HqB355+BZCPBcySvbTYMs62EgEQkNxz2ig==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/chunked-blob-reader-native@3.0.1':
+    resolution: {integrity: sha512-VEYtPvh5rs/xlyqpm5NRnfYLZn+q0SRPELbvBV+C/G7IQ+ouTuo+NKKa3ShG5OaFR8NYVMXls9hPYLTvIKKDrQ==}
 
-  '@smithy/chunked-blob-reader@5.0.0':
-    resolution: {integrity: sha512-+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/chunked-blob-reader@4.0.0':
+    resolution: {integrity: sha512-jSqRnZvkT4egkq/7b6/QRCNXmmYVcHwnJldqJ3IhVpQE2atObVJ137xmGeuGFhjFUr8gCEVAOKwSY79OvpbDaQ==}
 
   '@smithy/config-resolver@2.2.0':
     resolution: {integrity: sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/config-resolver@4.0.1':
-    resolution: {integrity: sha512-Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/config-resolver@3.0.10':
+    resolution: {integrity: sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/core@1.4.2':
     resolution: {integrity: sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/core@3.1.0':
-    resolution: {integrity: sha512-swFv0wQiK7TGHeuAp6lfF5Kw1dHWsTrCuc+yh4Kh05gEShjsE2RUxHucEerR9ih9JITNtaHcSpUThn5Y/vDw0A==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/core@2.5.1':
+    resolution: {integrity: sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/credential-provider-imds@2.3.0':
     resolution: {integrity: sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/credential-provider-imds@4.0.1':
-    resolution: {integrity: sha512-l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/credential-provider-imds@3.2.5':
+    resolution: {integrity: sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-codec@2.2.0':
     resolution: {integrity: sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==}
 
-  '@smithy/eventstream-codec@4.0.1':
-    resolution: {integrity: sha512-Q2bCAAR6zXNVtJgifsU16ZjKGqdw/DyecKNgIgi7dlqw04fqDu0mnq+JmGphqheypVc64CYq3azSuCpAdFk2+A==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/eventstream-codec@3.1.7':
+    resolution: {integrity: sha512-kVSXScIiRN7q+s1x7BrQtZ1Aa9hvvP9FeCqCdBxv37GimIHgBCOnZ5Ip80HLt0DhnAKpiobFdGqTFgbaJNrazA==}
 
   '@smithy/eventstream-serde-browser@2.2.0':
     resolution: {integrity: sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/eventstream-serde-browser@4.0.1':
-    resolution: {integrity: sha512-HbIybmz5rhNg+zxKiyVAnvdM3vkzjE6ccrJ620iPL8IXcJEntd3hnBl+ktMwIy12Te/kyrSbUb8UCdnUT4QEdA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/eventstream-serde-browser@3.0.11':
+    resolution: {integrity: sha512-Pd1Wnq3CQ/v2SxRifDUihvpXzirJYbbtXfEnnLV/z0OGCTx/btVX74P86IgrZkjOydOASBGXdPpupYQI+iO/6A==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-serde-config-resolver@2.2.0':
     resolution: {integrity: sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/eventstream-serde-config-resolver@4.0.1':
-    resolution: {integrity: sha512-lSipaiq3rmHguHa3QFF4YcCM3VJOrY9oq2sow3qlhFY+nBSTF/nrO82MUQRPrxHQXA58J5G1UnU2WuJfi465BA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/eventstream-serde-config-resolver@3.0.8':
+    resolution: {integrity: sha512-zkFIG2i1BLbfoGQnf1qEeMqX0h5qAznzaZmMVNnvPZz9J5AWBPkOMckZWPedGUPcVITacwIdQXoPcdIQq5FRcg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-serde-node@2.2.0':
     resolution: {integrity: sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/eventstream-serde-node@4.0.1':
-    resolution: {integrity: sha512-o4CoOI6oYGYJ4zXo34U8X9szDe3oGjmHgsMGiZM0j4vtNoT+h80TLnkUcrLZR3+E6HIxqW+G+9WHAVfl0GXK0Q==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/eventstream-serde-node@3.0.10':
+    resolution: {integrity: sha512-hjpU1tIsJ9qpcoZq9zGHBJPBOeBGYt+n8vfhDwnITPhEre6APrvqq/y3XMDEGUT2cWQ4ramNqBPRbx3qn55rhw==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-serde-universal@2.2.0':
     resolution: {integrity: sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/eventstream-serde-universal@4.0.1':
-    resolution: {integrity: sha512-Z94uZp0tGJuxds3iEAZBqGU2QiaBHP4YytLUjwZWx+oUeohCsLyUm33yp4MMBmhkuPqSbQCXq5hDet6JGUgHWA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/eventstream-serde-universal@3.0.10':
+    resolution: {integrity: sha512-ewG1GHbbqsFZ4asaq40KmxCmXO+AFSM1b+DcO2C03dyJj/ZH71CiTg853FSE/3SHK9q3jiYQIFjlGSwfxQ9kww==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/fetch-http-handler@2.5.0':
     resolution: {integrity: sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==}
 
-  '@smithy/fetch-http-handler@5.0.1':
-    resolution: {integrity: sha512-3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/fetch-http-handler@4.0.0':
+    resolution: {integrity: sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==}
 
-  '@smithy/hash-blob-browser@4.0.1':
-    resolution: {integrity: sha512-rkFIrQOKZGS6i1D3gKJ8skJ0RlXqDvb1IyAphksaFOMzkn3v3I1eJ8m7OkLj0jf1McP63rcCEoLlkAn/HjcTRw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/hash-blob-browser@3.1.7':
+    resolution: {integrity: sha512-4yNlxVNJifPM5ThaA5HKnHkn7JhctFUHvcaz6YXxHlYOSIrzI6VKQPTN8Gs1iN5nqq9iFcwIR9THqchUCouIfg==}
 
   '@smithy/hash-node@1.1.0':
     resolution: {integrity: sha512-yiNKDGMzrQjnpnbLfkYKo+HwIxmBAsv0AI++QIJwvhfkLpUTBylelkv6oo78/YqZZS6h+bGfl0gILJsKE2wAKQ==}
@@ -3680,20 +3675,19 @@ packages:
     resolution: {integrity: sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/hash-node@4.0.1':
-    resolution: {integrity: sha512-TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/hash-node@3.0.8':
+    resolution: {integrity: sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/hash-stream-node@4.0.1':
-    resolution: {integrity: sha512-U1rAE1fxmReCIr6D2o/4ROqAQX+GffZpyMt3d7njtGDr2pUNmAKRWa49gsNVhCh2vVAuf3wXzWwNr2YN8PAXIw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/hash-stream-node@3.1.7':
+    resolution: {integrity: sha512-xMAsvJ3hLG63lsBVi1Hl6BBSfhd8/Qnp8fC06kjOpJvyyCEXdwHITa5Kvdsk6gaAXLhbZMhQMIGvgUbfnJDP6Q==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/invalid-dependency@2.2.0':
     resolution: {integrity: sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==}
 
-  '@smithy/invalid-dependency@4.0.1':
-    resolution: {integrity: sha512-gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/invalid-dependency@3.0.8':
+    resolution: {integrity: sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==}
 
   '@smithy/is-array-buffer@1.1.0':
     resolution: {integrity: sha512-twpQ/n+3OWZJ7Z+xu43MJErmhB/WO/mMTnqR6PwWQShvSJ/emx5d1N59LQZk6ZpTAeuRWrc+eHhkzTp9NFjNRQ==}
@@ -3703,64 +3697,63 @@ packages:
     resolution: {integrity: sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/is-array-buffer@4.0.0':
-    resolution: {integrity: sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/is-array-buffer@3.0.0':
+    resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/md5-js@2.2.0':
     resolution: {integrity: sha512-M26XTtt9IIusVMOWEAhIvFIr9jYj4ISPPGJROqw6vXngO3IYJCnVVSMFn4Tx1rUTG5BiKJNg9u2nxmBiZC5IlQ==}
 
-  '@smithy/md5-js@4.0.1':
-    resolution: {integrity: sha512-HLZ647L27APi6zXkZlzSFZIjpo8po45YiyjMGJZM3gyDY8n7dPGdmxIIljLm4gPt/7rRvutLTTkYJpZVfG5r+A==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/md5-js@3.0.8':
+    resolution: {integrity: sha512-LwApfTK0OJ/tCyNUXqnWCKoE2b4rDSr4BJlDAVCkiWYeHESr+y+d5zlAanuLW6fnitVJRD/7d9/kN/ZM9Su4mA==}
 
   '@smithy/middleware-content-length@2.2.0':
     resolution: {integrity: sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/middleware-content-length@4.0.1':
-    resolution: {integrity: sha512-OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-content-length@3.0.10':
+    resolution: {integrity: sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/middleware-endpoint@2.5.1':
     resolution: {integrity: sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/middleware-endpoint@4.0.1':
-    resolution: {integrity: sha512-hCCOPu9+sRI7Wj0rZKKnGylKXBEd9cQJetzjQqe8cT4PWvtQAbvNVa6cgAONiZg9m8LaXtP9/waxm3C3eO4hiw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-endpoint@3.2.1':
+    resolution: {integrity: sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/middleware-retry@2.3.1':
     resolution: {integrity: sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/middleware-retry@4.0.2':
-    resolution: {integrity: sha512-cJoyDPcpxu84QcFOCgh+ehDm+OjuOLHDQdkVYT898KIXDpEDrjQB3p40EeQNCsT5d36y10yoJe3f/aADoTBXSg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-retry@3.0.25':
+    resolution: {integrity: sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/middleware-serde@2.3.0':
     resolution: {integrity: sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/middleware-serde@4.0.1':
-    resolution: {integrity: sha512-Fh0E2SOF+S+P1+CsgKyiBInAt3o2b6Qk7YOp2W0Qx2XnfTdfMuSDKUEcnrtpxCzgKJnqXeLUZYqtThaP0VGqtA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-serde@3.0.8':
+    resolution: {integrity: sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/middleware-stack@2.2.0':
     resolution: {integrity: sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/middleware-stack@4.0.1':
-    resolution: {integrity: sha512-dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-stack@3.0.8':
+    resolution: {integrity: sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/node-config-provider@2.3.0':
     resolution: {integrity: sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/node-config-provider@4.0.1':
-    resolution: {integrity: sha512-8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/node-config-provider@3.1.9':
+    resolution: {integrity: sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/node-http-handler@1.1.0':
     resolution: {integrity: sha512-d3kRriEgaIiGXLziAM8bjnaLn1fthCJeTLZIwEIpzQqe6yPX0a+yQoLCTyjb2fvdLwkMoG4p7THIIB5cj5lkbg==}
@@ -3770,17 +3763,17 @@ packages:
     resolution: {integrity: sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/node-http-handler@4.0.1':
-    resolution: {integrity: sha512-ddQc7tvXiVLC5c3QKraGWde761KSk+mboCheZoWtuqnXh5l0WKyFy3NfDIM/dsKrI9HlLVH/21pi9wWK2gUFFA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/node-http-handler@3.2.5':
+    resolution: {integrity: sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/property-provider@2.2.0':
     resolution: {integrity: sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/property-provider@4.0.1':
-    resolution: {integrity: sha512-o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/property-provider@3.1.8':
+    resolution: {integrity: sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/protocol-http@1.2.0':
     resolution: {integrity: sha512-GfGfruksi3nXdFok5RhgtOnWe5f6BndzYfmEXISD+5gAGdayFGpjWu5pIqIweTudMtse20bGbc+7MFZXT1Tb8Q==}
@@ -3790,9 +3783,9 @@ packages:
     resolution: {integrity: sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/protocol-http@5.0.1':
-    resolution: {integrity: sha512-TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/protocol-http@4.1.5':
+    resolution: {integrity: sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/querystring-builder@1.1.0':
     resolution: {integrity: sha512-gDEi4LxIGLbdfjrjiY45QNbuDmpkwh9DX4xzrR2AzjjXpxwGyfSpbJaYhXARw9p17VH0h9UewnNQXNwaQyYMDA==}
@@ -3802,9 +3795,9 @@ packages:
     resolution: {integrity: sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/querystring-builder@4.0.1':
-    resolution: {integrity: sha512-wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/querystring-builder@3.0.8':
+    resolution: {integrity: sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/querystring-parser@1.1.0':
     resolution: {integrity: sha512-Lm/FZu2qW3XX+kZ4WPwr+7aAeHf1Lm84UjNkKyBu16XbmEV7ukfhXni2aIwS2rcVf8Yv5E7wchGGpOFldj9V4Q==}
@@ -3814,41 +3807,41 @@ packages:
     resolution: {integrity: sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/querystring-parser@4.0.1':
-    resolution: {integrity: sha512-Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/querystring-parser@3.0.8':
+    resolution: {integrity: sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/service-error-classification@2.1.5':
     resolution: {integrity: sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/service-error-classification@4.0.1':
-    resolution: {integrity: sha512-3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/service-error-classification@3.0.8':
+    resolution: {integrity: sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/shared-ini-file-loader@2.4.0':
     resolution: {integrity: sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/shared-ini-file-loader@4.0.1':
-    resolution: {integrity: sha512-hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/shared-ini-file-loader@3.1.9':
+    resolution: {integrity: sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/signature-v4@2.3.0':
     resolution: {integrity: sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/signature-v4@5.0.1':
-    resolution: {integrity: sha512-nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/signature-v4@4.2.1':
+    resolution: {integrity: sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/smithy-client@2.5.1':
     resolution: {integrity: sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/smithy-client@4.1.1':
-    resolution: {integrity: sha512-nxsNWCDmWR6LrnC55+fKhbuA1S9v/gNh+5BSiYEQ5X8OYCRZj3G8DBoLoWNc5oXd7LOXvoPEXRnsRph4at8Ttw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/smithy-client@3.4.2':
+    resolution: {integrity: sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/types@1.2.0':
     resolution: {integrity: sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==}
@@ -3858,9 +3851,9 @@ packages:
     resolution: {integrity: sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/types@4.1.0':
-    resolution: {integrity: sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/types@3.6.0':
+    resolution: {integrity: sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/url-parser@1.1.0':
     resolution: {integrity: sha512-tpvi761kzboiLNGEWczuybMPCJh6WHB3cz9gWAG95mSyaKXmmX8ZcMxoV+irZfxDqLwZVJ22XTumu32S7Ow8aQ==}
@@ -3868,32 +3861,30 @@ packages:
   '@smithy/url-parser@2.2.0':
     resolution: {integrity: sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==}
 
-  '@smithy/url-parser@4.0.1':
-    resolution: {integrity: sha512-gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/url-parser@3.0.8':
+    resolution: {integrity: sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==}
 
   '@smithy/util-base64@2.3.0':
     resolution: {integrity: sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-base64@4.0.0':
-    resolution: {integrity: sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-base64@3.0.0':
+    resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-body-length-browser@2.2.0':
     resolution: {integrity: sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==}
 
-  '@smithy/util-body-length-browser@4.0.0':
-    resolution: {integrity: sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-body-length-browser@3.0.0':
+    resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==}
 
   '@smithy/util-body-length-node@2.3.0':
     resolution: {integrity: sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-body-length-node@4.0.0':
-    resolution: {integrity: sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-body-length-node@3.0.0':
+    resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-buffer-from@1.1.0':
     resolution: {integrity: sha512-9m6NXE0ww+ra5HKHCHig20T+FAwxBAm7DIdwc/767uGWbRcY720ybgPacQNB96JMOI7xVr/CDa3oMzKmW4a+kw==}
@@ -3903,73 +3894,73 @@ packages:
     resolution: {integrity: sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-buffer-from@4.0.0':
-    resolution: {integrity: sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-buffer-from@3.0.0':
+    resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-config-provider@2.3.0':
     resolution: {integrity: sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-config-provider@4.0.0':
-    resolution: {integrity: sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-config-provider@3.0.0':
+    resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-defaults-mode-browser@2.2.1':
     resolution: {integrity: sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-defaults-mode-browser@4.0.2':
-    resolution: {integrity: sha512-A7mlrRyOMxujL8M5rpCGR0vNdJoN1xP87cXQx+rmMTK0LBDlFg0arRQSqtbckNRNEqfjFx3Dna27tmDNUbAgGQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-defaults-mode-browser@3.0.25':
+    resolution: {integrity: sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==}
+    engines: {node: '>= 10.0.0'}
 
   '@smithy/util-defaults-mode-node@2.3.1':
     resolution: {integrity: sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-defaults-mode-node@4.0.2':
-    resolution: {integrity: sha512-iyv3X7zfatV/6Oh1HNCqscTrRGUJUEDLOVv6fmGL7vjgUvEQ1xgKBbuIG8UP0dDbcYk0f96kjn9jbc0IdCmLyw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-defaults-mode-node@3.0.25':
+    resolution: {integrity: sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==}
+    engines: {node: '>= 10.0.0'}
 
   '@smithy/util-endpoints@1.2.0':
     resolution: {integrity: sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==}
     engines: {node: '>= 14.0.0'}
 
-  '@smithy/util-endpoints@3.0.1':
-    resolution: {integrity: sha512-zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-endpoints@2.1.4':
+    resolution: {integrity: sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-hex-encoding@2.2.0':
     resolution: {integrity: sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-hex-encoding@4.0.0':
-    resolution: {integrity: sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-hex-encoding@3.0.0':
+    resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-middleware@2.2.0':
     resolution: {integrity: sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-middleware@4.0.1':
-    resolution: {integrity: sha512-HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-middleware@3.0.8':
+    resolution: {integrity: sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-retry@2.2.0':
     resolution: {integrity: sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==}
     engines: {node: '>= 14.0.0'}
 
-  '@smithy/util-retry@4.0.1':
-    resolution: {integrity: sha512-WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-retry@3.0.8':
+    resolution: {integrity: sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-stream@2.2.0':
     resolution: {integrity: sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-stream@4.0.1':
-    resolution: {integrity: sha512-Js16gOgU6Qht6qTPfuJgb+1YD4AEO+5Y1UPGWKSp3BNo8ONl/qhXSYDhFKJtwybRJynlCqvP5IeiaBsUmkSPTQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-stream@3.2.1':
+    resolution: {integrity: sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-uri-escape@1.1.0':
     resolution: {integrity: sha512-/jL/V1xdVRt5XppwiaEU8Etp5WHZj609n0xMTuehmCqdoOFbId1M+aEeDWZsQ+8JbEB/BJ6ynY2SlYmOaKtt8w==}
@@ -3979,9 +3970,9 @@ packages:
     resolution: {integrity: sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-uri-escape@4.0.0':
-    resolution: {integrity: sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-uri-escape@3.0.0':
+    resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-utf8@1.1.0':
     resolution: {integrity: sha512-p/MYV+JmqmPyjdgyN2UxAeYDj9cBqCjp0C/NsTWnnjoZUVqoeZ6IrW915L9CAKWVECgv9lVQGc4u/yz26/bI1A==}
@@ -3991,13 +3982,13 @@ packages:
     resolution: {integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-utf8@4.0.0':
-    resolution: {integrity: sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-utf8@3.0.0':
+    resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-waiter@4.0.2':
-    resolution: {integrity: sha512-piUTHyp2Axx3p/kc2CIJkYSv0BAaheBQmbACZgQSSfWUumWNW+R1lL+H9PDBxKJkvOeEX+hKYEFiwO8xagL8AQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-waiter@3.1.7':
+    resolution: {integrity: sha512-d5yGlQtmN/z5eoTtIYgkvOw27US2Ous4VycnXatyoImIF9tzlcpnKqQ/V7qhvJmb2p6xZne1NopCLakdTnkBBQ==}
+    engines: {node: '>=16.0.0'}
 
   '@socket.io/component-emitter@3.1.2':
     resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
@@ -5788,8 +5779,8 @@ packages:
     resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==}
     hasBin: true
 
-  fast-xml-parser@4.5.1:
-    resolution: {integrity: sha512-y655CeyUQ+jj7KBbYMc4FG01V8ZQqjN+gDYGJ50RtfsUB8iG9AmwmwoAgeKLJdmueKKMrH1RJ7yXHTSoczdv5w==}
+  fast-xml-parser@4.5.0:
+    resolution: {integrity: sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==}
     hasBin: true
 
   fastest-levenshtein@1.0.16:
@@ -6036,8 +6027,8 @@ packages:
     resolution: {integrity: sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA==}
     engines: {node: '>=10'}
 
-  google-auth-library@9.15.0:
-    resolution: {integrity: sha512-7ccSEJFDFO7exFbO6NRyC+xH8/mZ1GZGG2xxx9iHxZWcjUjJpjWxIMw3cofAKcueZ6DATiukmmprD7yavQHOyQ==}
+  google-auth-library@9.14.2:
+    resolution: {integrity: sha512-R+FRIfk1GBo3RdlRYWPdwk8nmtVUOn6+BkDomAC46KoU8kzXzE1HLmOasSCbWUByMMAGkknVF0G5kQ69Vj7dlA==}
     engines: {node: '>=14'}
 
   google-p12-pem@3.1.4:
@@ -8871,13 +8862,13 @@ snapshots:
   '@aws-crypto/crc32@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.723.0
+      '@aws-sdk/types': 3.686.0
       tslib: 2.6.2
 
   '@aws-crypto/crc32c@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.723.0
+      '@aws-sdk/types': 3.686.0
       tslib: 2.6.2
 
   '@aws-crypto/ie11-detection@3.0.0':
@@ -8888,7 +8879,7 @@ snapshots:
     dependencies:
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.723.0
+      '@aws-sdk/types': 3.686.0
       '@aws-sdk/util-locate-window': 3.535.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
@@ -8909,7 +8900,7 @@ snapshots:
       '@aws-crypto/sha256-js': 5.2.0
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.723.0
+      '@aws-sdk/types': 3.686.0
       '@aws-sdk/util-locate-window': 3.535.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
@@ -8923,7 +8914,7 @@ snapshots:
   '@aws-crypto/sha256-js@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.723.0
+      '@aws-sdk/types': 3.686.0
       tslib: 2.6.2
 
   '@aws-crypto/supports-web-crypto@3.0.0':
@@ -8942,7 +8933,7 @@ snapshots:
 
   '@aws-crypto/util@5.2.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
+      '@aws-sdk/types': 3.686.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
@@ -8950,8 +8941,8 @@ snapshots:
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sso-oidc': 3.572.0
-      '@aws-sdk/client-sts': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)
+      '@aws-sdk/client-sso-oidc': 3.572.0(@aws-sdk/client-sts@3.572.0)
+      '@aws-sdk/client-sts': 3.572.0
       '@aws-sdk/core': 3.572.0
       '@aws-sdk/credential-provider-node': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)(@aws-sdk/client-sts@3.572.0)
       '@aws-sdk/middleware-host-header': 3.567.0
@@ -9041,65 +9032,65 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-s3@3.726.1':
+  '@aws-sdk/client-s3@3.689.0':
     dependencies:
       '@aws-crypto/sha1-browser': 5.2.0
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.726.0(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/client-sts': 3.726.1
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/credential-provider-node': 3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/middleware-bucket-endpoint': 3.726.0
-      '@aws-sdk/middleware-expect-continue': 3.723.0
-      '@aws-sdk/middleware-flexible-checksums': 3.723.0
-      '@aws-sdk/middleware-host-header': 3.723.0
-      '@aws-sdk/middleware-location-constraint': 3.723.0
-      '@aws-sdk/middleware-logger': 3.723.0
-      '@aws-sdk/middleware-recursion-detection': 3.723.0
-      '@aws-sdk/middleware-sdk-s3': 3.723.0
-      '@aws-sdk/middleware-ssec': 3.723.0
-      '@aws-sdk/middleware-user-agent': 3.726.0
-      '@aws-sdk/region-config-resolver': 3.723.0
-      '@aws-sdk/signature-v4-multi-region': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-endpoints': 3.726.0
-      '@aws-sdk/util-user-agent-browser': 3.723.0
-      '@aws-sdk/util-user-agent-node': 3.726.0
-      '@aws-sdk/xml-builder': 3.723.0
-      '@smithy/config-resolver': 4.0.1
-      '@smithy/core': 3.1.0
-      '@smithy/eventstream-serde-browser': 4.0.1
-      '@smithy/eventstream-serde-config-resolver': 4.0.1
-      '@smithy/eventstream-serde-node': 4.0.1
-      '@smithy/fetch-http-handler': 5.0.1
-      '@smithy/hash-blob-browser': 4.0.1
-      '@smithy/hash-node': 4.0.1
-      '@smithy/hash-stream-node': 4.0.1
-      '@smithy/invalid-dependency': 4.0.1
-      '@smithy/md5-js': 4.0.1
-      '@smithy/middleware-content-length': 4.0.1
-      '@smithy/middleware-endpoint': 4.0.1
-      '@smithy/middleware-retry': 4.0.2
-      '@smithy/middleware-serde': 4.0.1
-      '@smithy/middleware-stack': 4.0.1
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/node-http-handler': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/url-parser': 4.0.1
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.2
-      '@smithy/util-defaults-mode-node': 4.0.2
-      '@smithy/util-endpoints': 3.0.1
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-retry': 4.0.1
-      '@smithy/util-stream': 4.0.1
-      '@smithy/util-utf8': 4.0.0
-      '@smithy/util-waiter': 4.0.2
+      '@aws-sdk/client-sso-oidc': 3.687.0(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/client-sts': 3.687.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/credential-provider-node': 3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/middleware-bucket-endpoint': 3.686.0
+      '@aws-sdk/middleware-expect-continue': 3.686.0
+      '@aws-sdk/middleware-flexible-checksums': 3.689.0
+      '@aws-sdk/middleware-host-header': 3.686.0
+      '@aws-sdk/middleware-location-constraint': 3.686.0
+      '@aws-sdk/middleware-logger': 3.686.0
+      '@aws-sdk/middleware-recursion-detection': 3.686.0
+      '@aws-sdk/middleware-sdk-s3': 3.687.0
+      '@aws-sdk/middleware-ssec': 3.686.0
+      '@aws-sdk/middleware-user-agent': 3.687.0
+      '@aws-sdk/region-config-resolver': 3.686.0
+      '@aws-sdk/signature-v4-multi-region': 3.687.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-endpoints': 3.686.0
+      '@aws-sdk/util-user-agent-browser': 3.686.0
+      '@aws-sdk/util-user-agent-node': 3.687.0
+      '@aws-sdk/xml-builder': 3.686.0
+      '@smithy/config-resolver': 3.0.10
+      '@smithy/core': 2.5.1
+      '@smithy/eventstream-serde-browser': 3.0.11
+      '@smithy/eventstream-serde-config-resolver': 3.0.8
+      '@smithy/eventstream-serde-node': 3.0.10
+      '@smithy/fetch-http-handler': 4.0.0
+      '@smithy/hash-blob-browser': 3.1.7
+      '@smithy/hash-node': 3.0.8
+      '@smithy/hash-stream-node': 3.1.7
+      '@smithy/invalid-dependency': 3.0.8
+      '@smithy/md5-js': 3.0.8
+      '@smithy/middleware-content-length': 3.0.10
+      '@smithy/middleware-endpoint': 3.2.1
+      '@smithy/middleware-retry': 3.0.25
+      '@smithy/middleware-serde': 3.0.8
+      '@smithy/middleware-stack': 3.0.8
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/node-http-handler': 3.2.5
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/url-parser': 3.0.8
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.25
+      '@smithy/util-defaults-mode-node': 3.0.25
+      '@smithy/util-endpoints': 2.1.4
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-retry': 3.0.8
+      '@smithy/util-stream': 3.2.1
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.1.7
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
@@ -9194,11 +9185,11 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.572.0':
+  '@aws-sdk/client-sso-oidc@3.572.0(@aws-sdk/client-sts@3.572.0)':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)
+      '@aws-sdk/client-sts': 3.572.0
       '@aws-sdk/core': 3.572.0
       '@aws-sdk/credential-provider-node': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)(@aws-sdk/client-sts@3.572.0)
       '@aws-sdk/middleware-host-header': 3.567.0
@@ -9237,49 +9228,50 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1)':
+  '@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.726.1
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/credential-provider-node': 3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/middleware-host-header': 3.723.0
-      '@aws-sdk/middleware-logger': 3.723.0
-      '@aws-sdk/middleware-recursion-detection': 3.723.0
-      '@aws-sdk/middleware-user-agent': 3.726.0
-      '@aws-sdk/region-config-resolver': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-endpoints': 3.726.0
-      '@aws-sdk/util-user-agent-browser': 3.723.0
-      '@aws-sdk/util-user-agent-node': 3.726.0
-      '@smithy/config-resolver': 4.0.1
-      '@smithy/core': 3.1.0
-      '@smithy/fetch-http-handler': 5.0.1
-      '@smithy/hash-node': 4.0.1
-      '@smithy/invalid-dependency': 4.0.1
-      '@smithy/middleware-content-length': 4.0.1
-      '@smithy/middleware-endpoint': 4.0.1
-      '@smithy/middleware-retry': 4.0.2
-      '@smithy/middleware-serde': 4.0.1
-      '@smithy/middleware-stack': 4.0.1
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/node-http-handler': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/url-parser': 4.0.1
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.2
-      '@smithy/util-defaults-mode-node': 4.0.2
-      '@smithy/util-endpoints': 3.0.1
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-retry': 4.0.1
-      '@smithy/util-utf8': 4.0.0
+      '@aws-sdk/client-sts': 3.687.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/credential-provider-node': 3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/middleware-host-header': 3.686.0
+      '@aws-sdk/middleware-logger': 3.686.0
+      '@aws-sdk/middleware-recursion-detection': 3.686.0
+      '@aws-sdk/middleware-user-agent': 3.687.0
+      '@aws-sdk/region-config-resolver': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-endpoints': 3.686.0
+      '@aws-sdk/util-user-agent-browser': 3.686.0
+      '@aws-sdk/util-user-agent-node': 3.687.0
+      '@smithy/config-resolver': 3.0.10
+      '@smithy/core': 2.5.1
+      '@smithy/fetch-http-handler': 4.0.0
+      '@smithy/hash-node': 3.0.8
+      '@smithy/invalid-dependency': 3.0.8
+      '@smithy/middleware-content-length': 3.0.10
+      '@smithy/middleware-endpoint': 3.2.1
+      '@smithy/middleware-retry': 3.0.25
+      '@smithy/middleware-serde': 3.0.8
+      '@smithy/middleware-stack': 3.0.8
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/node-http-handler': 3.2.5
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/url-parser': 3.0.8
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.25
+      '@smithy/util-defaults-mode-node': 3.0.25
+      '@smithy/util-endpoints': 2.1.4
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-retry': 3.0.8
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
@@ -9370,45 +9362,45 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso@3.726.0':
+  '@aws-sdk/client-sso@3.687.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/middleware-host-header': 3.723.0
-      '@aws-sdk/middleware-logger': 3.723.0
-      '@aws-sdk/middleware-recursion-detection': 3.723.0
-      '@aws-sdk/middleware-user-agent': 3.726.0
-      '@aws-sdk/region-config-resolver': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-endpoints': 3.726.0
-      '@aws-sdk/util-user-agent-browser': 3.723.0
-      '@aws-sdk/util-user-agent-node': 3.726.0
-      '@smithy/config-resolver': 4.0.1
-      '@smithy/core': 3.1.0
-      '@smithy/fetch-http-handler': 5.0.1
-      '@smithy/hash-node': 4.0.1
-      '@smithy/invalid-dependency': 4.0.1
-      '@smithy/middleware-content-length': 4.0.1
-      '@smithy/middleware-endpoint': 4.0.1
-      '@smithy/middleware-retry': 4.0.2
-      '@smithy/middleware-serde': 4.0.1
-      '@smithy/middleware-stack': 4.0.1
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/node-http-handler': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/url-parser': 4.0.1
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.2
-      '@smithy/util-defaults-mode-node': 4.0.2
-      '@smithy/util-endpoints': 3.0.1
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-retry': 4.0.1
-      '@smithy/util-utf8': 4.0.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/middleware-host-header': 3.686.0
+      '@aws-sdk/middleware-logger': 3.686.0
+      '@aws-sdk/middleware-recursion-detection': 3.686.0
+      '@aws-sdk/middleware-user-agent': 3.687.0
+      '@aws-sdk/region-config-resolver': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-endpoints': 3.686.0
+      '@aws-sdk/util-user-agent-browser': 3.686.0
+      '@aws-sdk/util-user-agent-node': 3.687.0
+      '@smithy/config-resolver': 3.0.10
+      '@smithy/core': 2.5.1
+      '@smithy/fetch-http-handler': 4.0.0
+      '@smithy/hash-node': 3.0.8
+      '@smithy/invalid-dependency': 3.0.8
+      '@smithy/middleware-content-length': 3.0.10
+      '@smithy/middleware-endpoint': 3.2.1
+      '@smithy/middleware-retry': 3.0.25
+      '@smithy/middleware-serde': 3.0.8
+      '@smithy/middleware-stack': 3.0.8
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/node-http-handler': 3.2.5
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/url-parser': 3.0.8
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.25
+      '@smithy/util-defaults-mode-node': 3.0.25
+      '@smithy/util-endpoints': 2.1.4
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-retry': 3.0.8
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
@@ -9457,11 +9449,11 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sts@3.572.0(@aws-sdk/client-sso-oidc@3.572.0)':
+  '@aws-sdk/client-sts@3.572.0':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sso-oidc': 3.572.0
+      '@aws-sdk/client-sso-oidc': 3.572.0(@aws-sdk/client-sts@3.572.0)
       '@aws-sdk/core': 3.572.0
       '@aws-sdk/credential-provider-node': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)(@aws-sdk/client-sts@3.572.0)
       '@aws-sdk/middleware-host-header': 3.567.0
@@ -9500,50 +9492,49 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
     transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/client-sts@3.726.1':
+  '@aws-sdk/client-sts@3.687.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.726.0(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/credential-provider-node': 3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/middleware-host-header': 3.723.0
-      '@aws-sdk/middleware-logger': 3.723.0
-      '@aws-sdk/middleware-recursion-detection': 3.723.0
-      '@aws-sdk/middleware-user-agent': 3.726.0
-      '@aws-sdk/region-config-resolver': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-endpoints': 3.726.0
-      '@aws-sdk/util-user-agent-browser': 3.723.0
-      '@aws-sdk/util-user-agent-node': 3.726.0
-      '@smithy/config-resolver': 4.0.1
-      '@smithy/core': 3.1.0
-      '@smithy/fetch-http-handler': 5.0.1
-      '@smithy/hash-node': 4.0.1
-      '@smithy/invalid-dependency': 4.0.1
-      '@smithy/middleware-content-length': 4.0.1
-      '@smithy/middleware-endpoint': 4.0.1
-      '@smithy/middleware-retry': 4.0.2
-      '@smithy/middleware-serde': 4.0.1
-      '@smithy/middleware-stack': 4.0.1
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/node-http-handler': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/url-parser': 4.0.1
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.2
-      '@smithy/util-defaults-mode-node': 4.0.2
-      '@smithy/util-endpoints': 3.0.1
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-retry': 4.0.1
-      '@smithy/util-utf8': 4.0.0
+      '@aws-sdk/client-sso-oidc': 3.687.0(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/credential-provider-node': 3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/middleware-host-header': 3.686.0
+      '@aws-sdk/middleware-logger': 3.686.0
+      '@aws-sdk/middleware-recursion-detection': 3.686.0
+      '@aws-sdk/middleware-user-agent': 3.687.0
+      '@aws-sdk/region-config-resolver': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-endpoints': 3.686.0
+      '@aws-sdk/util-user-agent-browser': 3.686.0
+      '@aws-sdk/util-user-agent-node': 3.687.0
+      '@smithy/config-resolver': 3.0.10
+      '@smithy/core': 2.5.1
+      '@smithy/fetch-http-handler': 4.0.0
+      '@smithy/hash-node': 3.0.8
+      '@smithy/invalid-dependency': 3.0.8
+      '@smithy/middleware-content-length': 3.0.10
+      '@smithy/middleware-endpoint': 3.2.1
+      '@smithy/middleware-retry': 3.0.25
+      '@smithy/middleware-serde': 3.0.8
+      '@smithy/middleware-stack': 3.0.8
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/node-http-handler': 3.2.5
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/url-parser': 3.0.8
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.25
+      '@smithy/util-defaults-mode-node': 3.0.25
+      '@smithy/util-endpoints': 2.1.4
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-retry': 3.0.8
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
@@ -9568,17 +9559,17 @@ snapshots:
       fast-xml-parser: 4.2.5
       tslib: 2.6.2
 
-  '@aws-sdk/core@3.723.0':
-    dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/core': 3.1.0
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/property-provider': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/signature-v4': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-middleware': 4.0.1
+  '@aws-sdk/core@3.686.0':
+    dependencies:
+      '@aws-sdk/types': 3.686.0
+      '@smithy/core': 2.5.1
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/property-provider': 3.1.8
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/signature-v4': 4.2.1
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/util-middleware': 3.0.8
       fast-xml-parser: 4.4.1
       tslib: 2.6.2
 
@@ -9596,12 +9587,12 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-env@3.723.0':
+  '@aws-sdk/credential-provider-env@3.686.0':
     dependencies:
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/property-provider': 4.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/credential-provider-http@3.552.0':
@@ -9628,17 +9619,17 @@ snapshots:
       '@smithy/util-stream': 2.2.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-http@3.723.0':
-    dependencies:
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/fetch-http-handler': 5.0.1
-      '@smithy/node-http-handler': 4.0.1
-      '@smithy/property-provider': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-stream': 4.0.1
+  '@aws-sdk/credential-provider-http@3.686.0':
+    dependencies:
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/fetch-http-handler': 4.0.0
+      '@smithy/node-http-handler': 3.2.5
+      '@smithy/property-provider': 3.1.8
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/util-stream': 3.2.1
       tslib: 2.6.2
 
   '@aws-sdk/credential-provider-ini@3.564.0(@aws-sdk/credential-provider-node@3.564.0)':
@@ -9660,7 +9651,7 @@ snapshots:
 
   '@aws-sdk/credential-provider-ini@3.572.0(@aws-sdk/client-sso-oidc@3.572.0)(@aws-sdk/client-sts@3.572.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)
+      '@aws-sdk/client-sts': 3.572.0
       '@aws-sdk/credential-provider-env': 3.568.0
       '@aws-sdk/credential-provider-process': 3.572.0
       '@aws-sdk/credential-provider-sso': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)
@@ -9675,20 +9666,20 @@ snapshots:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-ini@3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))(@aws-sdk/client-sts@3.726.1)':
-    dependencies:
-      '@aws-sdk/client-sts': 3.726.1
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/credential-provider-env': 3.723.0
-      '@aws-sdk/credential-provider-http': 3.723.0
-      '@aws-sdk/credential-provider-process': 3.723.0
-      '@aws-sdk/credential-provider-sso': 3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))
-      '@aws-sdk/credential-provider-web-identity': 3.723.0(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/types': 3.723.0
-      '@smithy/credential-provider-imds': 4.0.1
-      '@smithy/property-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
+  '@aws-sdk/credential-provider-ini@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))(@aws-sdk/client-sts@3.687.0)':
+    dependencies:
+      '@aws-sdk/client-sts': 3.687.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/credential-provider-env': 3.686.0
+      '@aws-sdk/credential-provider-http': 3.686.0
+      '@aws-sdk/credential-provider-process': 3.686.0
+      '@aws-sdk/credential-provider-sso': 3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))
+      '@aws-sdk/credential-provider-web-identity': 3.686.0(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/types': 3.686.0
+      '@smithy/credential-provider-imds': 3.2.5
+      '@smithy/property-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
@@ -9730,19 +9721,19 @@ snapshots:
       - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@aws-sdk/credential-provider-node@3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))(@aws-sdk/client-sts@3.726.1)':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.723.0
-      '@aws-sdk/credential-provider-http': 3.723.0
-      '@aws-sdk/credential-provider-ini': 3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/credential-provider-process': 3.723.0
-      '@aws-sdk/credential-provider-sso': 3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))
-      '@aws-sdk/credential-provider-web-identity': 3.723.0(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/types': 3.723.0
-      '@smithy/credential-provider-imds': 4.0.1
-      '@smithy/property-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
+  '@aws-sdk/credential-provider-node@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))(@aws-sdk/client-sts@3.687.0)':
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.686.0
+      '@aws-sdk/credential-provider-http': 3.686.0
+      '@aws-sdk/credential-provider-ini': 3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/credential-provider-process': 3.686.0
+      '@aws-sdk/credential-provider-sso': 3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))
+      '@aws-sdk/credential-provider-web-identity': 3.686.0(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/types': 3.686.0
+      '@smithy/credential-provider-imds': 3.2.5
+      '@smithy/property-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
@@ -9765,13 +9756,13 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-process@3.723.0':
+  '@aws-sdk/credential-provider-process@3.686.0':
     dependencies:
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/property-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/credential-provider-sso@3.564.0(@aws-sdk/credential-provider-node@3.564.0)':
@@ -9800,15 +9791,15 @@ snapshots:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-sso@3.726.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))':
+  '@aws-sdk/credential-provider-sso@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))':
     dependencies:
-      '@aws-sdk/client-sso': 3.726.0
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/token-providers': 3.723.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))
-      '@aws-sdk/types': 3.723.0
-      '@smithy/property-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/client-sso': 3.687.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/token-providers': 3.686.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))
+      '@aws-sdk/types': 3.686.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
@@ -9827,19 +9818,19 @@ snapshots:
 
   '@aws-sdk/credential-provider-web-identity@3.568.0(@aws-sdk/client-sts@3.572.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.572.0(@aws-sdk/client-sso-oidc@3.572.0)
+      '@aws-sdk/client-sts': 3.572.0
       '@aws-sdk/types': 3.567.0
       '@smithy/property-provider': 2.2.0
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-web-identity@3.723.0(@aws-sdk/client-sts@3.726.1)':
+  '@aws-sdk/credential-provider-web-identity@3.686.0(@aws-sdk/client-sts@3.687.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.726.1
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/property-provider': 4.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/client-sts': 3.687.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/hash-node@3.374.0':
@@ -9847,37 +9838,37 @@ snapshots:
       '@smithy/hash-node': 1.1.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-bucket-endpoint@3.726.0':
+  '@aws-sdk/middleware-bucket-endpoint@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-arn-parser': 3.723.0
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-config-provider': 4.0.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-arn-parser': 3.679.0
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
+      '@smithy/util-config-provider': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-expect-continue@3.723.0':
+  '@aws-sdk/middleware-expect-continue@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-flexible-checksums@3.723.0':
+  '@aws-sdk/middleware-flexible-checksums@3.689.0':
     dependencies:
       '@aws-crypto/crc32': 5.2.0
       '@aws-crypto/crc32c': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/is-array-buffer': 4.0.0
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-stream': 4.0.1
-      '@smithy/util-utf8': 4.0.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-stream': 3.2.1
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@aws-sdk/middleware-host-header@3.535.0':
@@ -9894,17 +9885,17 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-host-header@3.723.0':
+  '@aws-sdk/middleware-host-header@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-location-constraint@3.723.0':
+  '@aws-sdk/middleware-location-constraint@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/middleware-logger@3.535.0':
@@ -9919,10 +9910,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-logger@3.723.0':
+  '@aws-sdk/middleware-logger@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/middleware-recursion-detection@3.535.0':
@@ -9939,11 +9930,11 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-recursion-detection@3.723.0':
+  '@aws-sdk/middleware-recursion-detection@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/middleware-sdk-s3@3.556.0':
@@ -9958,21 +9949,21 @@ snapshots:
       '@smithy/util-config-provider': 2.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-sdk-s3@3.723.0':
-    dependencies:
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-arn-parser': 3.723.0
-      '@smithy/core': 3.1.0
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/signature-v4': 5.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-config-provider': 4.0.0
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-stream': 4.0.1
-      '@smithy/util-utf8': 4.0.0
+  '@aws-sdk/middleware-sdk-s3@3.687.0':
+    dependencies:
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-arn-parser': 3.679.0
+      '@smithy/core': 2.5.1
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/signature-v4': 4.2.1
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-stream': 3.2.1
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@aws-sdk/middleware-sdk-sqs@3.552.0':
@@ -9984,10 +9975,10 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-ssec@3.723.0':
+  '@aws-sdk/middleware-ssec@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/middleware-user-agent@3.540.0':
@@ -10006,14 +9997,14 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-user-agent@3.726.0':
+  '@aws-sdk/middleware-user-agent@3.687.0':
     dependencies:
-      '@aws-sdk/core': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@aws-sdk/util-endpoints': 3.726.0
-      '@smithy/core': 3.1.0
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/core': 3.686.0
+      '@aws-sdk/types': 3.686.0
+      '@aws-sdk/util-endpoints': 3.686.0
+      '@smithy/core': 2.5.1
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/node-http-handler@3.374.0':
@@ -10044,13 +10035,13 @@ snapshots:
       '@smithy/util-middleware': 2.2.0
       tslib: 2.6.2
 
-  '@aws-sdk/region-config-resolver@3.723.0':
+  '@aws-sdk/region-config-resolver@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-config-provider': 4.0.0
-      '@smithy/util-middleware': 4.0.1
+      '@aws-sdk/types': 3.686.0
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/types': 3.6.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.8
       tslib: 2.6.2
 
   '@aws-sdk/s3-request-presigner@3.564.0':
@@ -10073,13 +10064,13 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/signature-v4-multi-region@3.723.0':
+  '@aws-sdk/signature-v4-multi-region@3.687.0':
     dependencies:
-      '@aws-sdk/middleware-sdk-s3': 3.723.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/signature-v4': 5.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/middleware-sdk-s3': 3.687.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/signature-v4': 4.2.1
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/token-providers@3.564.0(@aws-sdk/credential-provider-node@3.564.0)':
@@ -10096,20 +10087,20 @@ snapshots:
 
   '@aws-sdk/token-providers@3.572.0(@aws-sdk/client-sso-oidc@3.572.0)':
     dependencies:
-      '@aws-sdk/client-sso-oidc': 3.572.0
+      '@aws-sdk/client-sso-oidc': 3.572.0(@aws-sdk/client-sts@3.572.0)
       '@aws-sdk/types': 3.567.0
       '@smithy/property-provider': 2.2.0
       '@smithy/shared-ini-file-loader': 2.4.0
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/token-providers@3.723.0(@aws-sdk/client-sso-oidc@3.726.0(@aws-sdk/client-sts@3.726.1))':
+  '@aws-sdk/token-providers@3.686.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0))':
     dependencies:
-      '@aws-sdk/client-sso-oidc': 3.726.0(@aws-sdk/client-sts@3.726.1)
-      '@aws-sdk/types': 3.723.0
-      '@smithy/property-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/client-sso-oidc': 3.687.0(@aws-sdk/client-sts@3.687.0)
+      '@aws-sdk/types': 3.686.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/types@3.535.0':
@@ -10122,9 +10113,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/types@3.723.0':
+  '@aws-sdk/types@3.686.0':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/url-parser@3.374.0':
@@ -10136,7 +10127,7 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/util-arn-parser@3.723.0':
+  '@aws-sdk/util-arn-parser@3.679.0':
     dependencies:
       tslib: 2.6.2
 
@@ -10154,11 +10145,11 @@ snapshots:
       '@smithy/util-endpoints': 1.2.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-endpoints@3.726.0':
+  '@aws-sdk/util-endpoints@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/types': 4.1.0
-      '@smithy/util-endpoints': 3.0.1
+      '@aws-sdk/types': 3.686.0
+      '@smithy/types': 3.6.0
+      '@smithy/util-endpoints': 2.1.4
       tslib: 2.6.2
 
   '@aws-sdk/util-format-url@3.535.0':
@@ -10186,10 +10177,10 @@ snapshots:
       bowser: 2.11.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-user-agent-browser@3.723.0':
+  '@aws-sdk/util-user-agent-browser@3.686.0':
     dependencies:
-      '@aws-sdk/types': 3.723.0
-      '@smithy/types': 4.1.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/types': 3.6.0
       bowser: 2.11.0
       tslib: 2.6.2
 
@@ -10207,21 +10198,21 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-user-agent-node@3.726.0':
+  '@aws-sdk/util-user-agent-node@3.687.0':
     dependencies:
-      '@aws-sdk/middleware-user-agent': 3.726.0
-      '@aws-sdk/types': 3.723.0
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/types': 4.1.0
+      '@aws-sdk/middleware-user-agent': 3.687.0
+      '@aws-sdk/types': 3.686.0
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@aws-sdk/util-utf8-browser@3.259.0':
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/xml-builder@3.723.0':
+  '@aws-sdk/xml-builder@3.686.0':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@azure/abort-controller@1.1.0':
@@ -10238,7 +10229,7 @@ snapshots:
       '@azure/core-util': 1.11.0
       tslib: 2.6.2
 
-  '@azure/core-http@3.0.5(encoding@0.1.13)':
+  '@azure/core-http@3.0.4(encoding@0.1.13)':
     dependencies:
       '@azure/abort-controller': 1.1.0
       '@azure/core-auth': 1.9.0
@@ -10285,7 +10276,7 @@ snapshots:
   '@azure/storage-blob@12.18.0(encoding@0.1.13)':
     dependencies:
       '@azure/abort-controller': 1.1.0
-      '@azure/core-http': 3.0.5(encoding@0.1.13)
+      '@azure/core-http': 3.0.4(encoding@0.1.13)
       '@azure/core-lro': 2.7.2
       '@azure/core-paging': 1.6.2
       '@azure/core-tracing': 1.0.0-preview.13
@@ -11317,7 +11308,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@google-cloud/storage@7.15.0(encoding@0.1.13)':
+  '@google-cloud/storage@7.14.0(encoding@0.1.13)':
     dependencies:
       '@google-cloud/paginator': 5.0.2
       '@google-cloud/projectify': 4.0.0
@@ -11325,9 +11316,9 @@ snapshots:
       abort-controller: 3.0.0
       async-retry: 1.3.3
       duplexify: 4.1.3
-      fast-xml-parser: 4.5.1
+      fast-xml-parser: 4.5.0
       gaxios: 6.7.1(encoding@0.1.13)
-      google-auth-library: 9.15.0(encoding@0.1.13)
+      google-auth-library: 9.14.2(encoding@0.1.13)
       html-entities: 2.5.2
       mime: 3.0.0
       p-limit: 3.1.0
@@ -11847,17 +11838,17 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/abort-controller@4.0.1':
+  '@smithy/abort-controller@3.1.6':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
-  '@smithy/chunked-blob-reader-native@4.0.0':
+  '@smithy/chunked-blob-reader-native@3.0.1':
     dependencies:
-      '@smithy/util-base64': 4.0.0
+      '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/chunked-blob-reader@5.0.0':
+  '@smithy/chunked-blob-reader@4.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -11869,12 +11860,12 @@ snapshots:
       '@smithy/util-middleware': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/config-resolver@4.0.1':
+  '@smithy/config-resolver@3.0.10':
     dependencies:
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-config-provider': 4.0.0
-      '@smithy/util-middleware': 4.0.1
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/types': 3.6.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.8
       tslib: 2.6.2
 
   '@smithy/core@1.4.2':
@@ -11888,15 +11879,15 @@ snapshots:
       '@smithy/util-middleware': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/core@3.1.0':
+  '@smithy/core@2.5.1':
     dependencies:
-      '@smithy/middleware-serde': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-stream': 4.0.1
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/middleware-serde': 3.0.8
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-stream': 3.2.1
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/credential-provider-imds@2.3.0':
@@ -11907,12 +11898,12 @@ snapshots:
       '@smithy/url-parser': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/credential-provider-imds@4.0.1':
+  '@smithy/credential-provider-imds@3.2.5':
     dependencies:
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/property-provider': 4.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/url-parser': 4.0.1
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/property-provider': 3.1.8
+      '@smithy/types': 3.6.0
+      '@smithy/url-parser': 3.0.8
       tslib: 2.6.2
 
   '@smithy/eventstream-codec@2.2.0':
@@ -11922,11 +11913,11 @@ snapshots:
       '@smithy/util-hex-encoding': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-codec@4.0.1':
+  '@smithy/eventstream-codec@3.1.7':
     dependencies:
       '@aws-crypto/crc32': 5.2.0
-      '@smithy/types': 4.1.0
-      '@smithy/util-hex-encoding': 4.0.0
+      '@smithy/types': 3.6.0
+      '@smithy/util-hex-encoding': 3.0.0
       tslib: 2.6.2
 
   '@smithy/eventstream-serde-browser@2.2.0':
@@ -11935,10 +11926,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-browser@4.0.1':
+  '@smithy/eventstream-serde-browser@3.0.11':
     dependencies:
-      '@smithy/eventstream-serde-universal': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/eventstream-serde-universal': 3.0.10
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/eventstream-serde-config-resolver@2.2.0':
@@ -11946,9 +11937,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-config-resolver@4.0.1':
+  '@smithy/eventstream-serde-config-resolver@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/eventstream-serde-node@2.2.0':
@@ -11957,10 +11948,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-node@4.0.1':
+  '@smithy/eventstream-serde-node@3.0.10':
     dependencies:
-      '@smithy/eventstream-serde-universal': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/eventstream-serde-universal': 3.0.10
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/eventstream-serde-universal@2.2.0':
@@ -11969,10 +11960,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-universal@4.0.1':
+  '@smithy/eventstream-serde-universal@3.0.10':
     dependencies:
-      '@smithy/eventstream-codec': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/eventstream-codec': 3.1.7
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/fetch-http-handler@2.5.0':
@@ -11983,19 +11974,19 @@ snapshots:
       '@smithy/util-base64': 2.3.0
       tslib: 2.6.2
 
-  '@smithy/fetch-http-handler@5.0.1':
+  '@smithy/fetch-http-handler@4.0.0':
     dependencies:
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/querystring-builder': 4.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-base64': 4.0.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/querystring-builder': 3.0.8
+      '@smithy/types': 3.6.0
+      '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/hash-blob-browser@4.0.1':
+  '@smithy/hash-blob-browser@3.1.7':
     dependencies:
-      '@smithy/chunked-blob-reader': 5.0.0
-      '@smithy/chunked-blob-reader-native': 4.0.0
-      '@smithy/types': 4.1.0
+      '@smithy/chunked-blob-reader': 4.0.0
+      '@smithy/chunked-blob-reader-native': 3.0.1
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/hash-node@1.1.0':
@@ -12012,17 +12003,17 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@smithy/hash-node@4.0.1':
+  '@smithy/hash-node@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
-      '@smithy/util-buffer-from': 4.0.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/types': 3.6.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/hash-stream-node@4.0.1':
+  '@smithy/hash-stream-node@3.1.7':
     dependencies:
-      '@smithy/types': 4.1.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/types': 3.6.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/invalid-dependency@2.2.0':
@@ -12030,9 +12021,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/invalid-dependency@4.0.1':
+  '@smithy/invalid-dependency@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/is-array-buffer@1.1.0':
@@ -12043,7 +12034,7 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/is-array-buffer@4.0.0':
+  '@smithy/is-array-buffer@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12053,10 +12044,10 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@smithy/md5-js@4.0.1':
+  '@smithy/md5-js@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/types': 3.6.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/middleware-content-length@2.2.0':
@@ -12065,10 +12056,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/middleware-content-length@4.0.1':
+  '@smithy/middleware-content-length@3.0.10':
     dependencies:
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/middleware-endpoint@2.5.1':
@@ -12081,15 +12072,15 @@ snapshots:
       '@smithy/util-middleware': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/middleware-endpoint@4.0.1':
+  '@smithy/middleware-endpoint@3.2.1':
     dependencies:
-      '@smithy/core': 3.1.0
-      '@smithy/middleware-serde': 4.0.1
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/url-parser': 4.0.1
-      '@smithy/util-middleware': 4.0.1
+      '@smithy/core': 2.5.1
+      '@smithy/middleware-serde': 3.0.8
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
+      '@smithy/url-parser': 3.0.8
+      '@smithy/util-middleware': 3.0.8
       tslib: 2.6.2
 
   '@smithy/middleware-retry@2.3.1':
@@ -12104,15 +12095,15 @@ snapshots:
       tslib: 2.6.2
       uuid: 9.0.1
 
-  '@smithy/middleware-retry@4.0.2':
+  '@smithy/middleware-retry@3.0.25':
     dependencies:
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/service-error-classification': 4.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-retry': 4.0.1
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/service-error-classification': 3.0.8
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-retry': 3.0.8
       tslib: 2.6.2
       uuid: 9.0.1
 
@@ -12121,9 +12112,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/middleware-serde@4.0.1':
+  '@smithy/middleware-serde@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/middleware-stack@2.2.0':
@@ -12131,9 +12122,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/middleware-stack@4.0.1':
+  '@smithy/middleware-stack@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/node-config-provider@2.3.0':
@@ -12143,11 +12134,11 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/node-config-provider@4.0.1':
+  '@smithy/node-config-provider@3.1.9':
     dependencies:
-      '@smithy/property-provider': 4.0.1
-      '@smithy/shared-ini-file-loader': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/node-http-handler@1.1.0':
@@ -12166,12 +12157,12 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/node-http-handler@4.0.1':
+  '@smithy/node-http-handler@3.2.5':
     dependencies:
-      '@smithy/abort-controller': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/querystring-builder': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/abort-controller': 3.1.6
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/querystring-builder': 3.0.8
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/property-provider@2.2.0':
@@ -12179,9 +12170,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/property-provider@4.0.1':
+  '@smithy/property-provider@3.1.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/protocol-http@1.2.0':
@@ -12194,9 +12185,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/protocol-http@5.0.1':
+  '@smithy/protocol-http@4.1.5':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/querystring-builder@1.1.0':
@@ -12211,10 +12202,10 @@ snapshots:
       '@smithy/util-uri-escape': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/querystring-builder@4.0.1':
+  '@smithy/querystring-builder@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
-      '@smithy/util-uri-escape': 4.0.0
+      '@smithy/types': 3.6.0
+      '@smithy/util-uri-escape': 3.0.0
       tslib: 2.6.2
 
   '@smithy/querystring-parser@1.1.0':
@@ -12227,27 +12218,27 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/querystring-parser@4.0.1':
+  '@smithy/querystring-parser@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/service-error-classification@2.1.5':
     dependencies:
       '@smithy/types': 2.12.0
 
-  '@smithy/service-error-classification@4.0.1':
+  '@smithy/service-error-classification@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
 
   '@smithy/shared-ini-file-loader@2.4.0':
     dependencies:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/shared-ini-file-loader@4.0.1':
+  '@smithy/shared-ini-file-loader@3.1.9':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/signature-v4@2.3.0':
@@ -12260,15 +12251,15 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@smithy/signature-v4@5.0.1':
+  '@smithy/signature-v4@4.2.1':
     dependencies:
-      '@smithy/is-array-buffer': 4.0.0
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-hex-encoding': 4.0.0
-      '@smithy/util-middleware': 4.0.1
-      '@smithy/util-uri-escape': 4.0.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-middleware': 3.0.8
+      '@smithy/util-uri-escape': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/smithy-client@2.5.1':
@@ -12280,14 +12271,14 @@ snapshots:
       '@smithy/util-stream': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/smithy-client@4.1.1':
+  '@smithy/smithy-client@3.4.2':
     dependencies:
-      '@smithy/core': 3.1.0
-      '@smithy/middleware-endpoint': 4.0.1
-      '@smithy/middleware-stack': 4.0.1
-      '@smithy/protocol-http': 5.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-stream': 4.0.1
+      '@smithy/core': 2.5.1
+      '@smithy/middleware-endpoint': 3.2.1
+      '@smithy/middleware-stack': 3.0.8
+      '@smithy/protocol-http': 4.1.5
+      '@smithy/types': 3.6.0
+      '@smithy/util-stream': 3.2.1
       tslib: 2.6.2
 
   '@smithy/types@1.2.0':
@@ -12298,7 +12289,7 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/types@4.1.0':
+  '@smithy/types@3.6.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12314,10 +12305,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/url-parser@4.0.1':
+  '@smithy/url-parser@3.0.8':
     dependencies:
-      '@smithy/querystring-parser': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/querystring-parser': 3.0.8
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/util-base64@2.3.0':
@@ -12326,17 +12317,17 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@smithy/util-base64@4.0.0':
+  '@smithy/util-base64@3.0.0':
     dependencies:
-      '@smithy/util-buffer-from': 4.0.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/util-body-length-browser@2.2.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-body-length-browser@4.0.0':
+  '@smithy/util-body-length-browser@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12344,7 +12335,7 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-body-length-node@4.0.0':
+  '@smithy/util-body-length-node@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12358,16 +12349,16 @@ snapshots:
       '@smithy/is-array-buffer': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/util-buffer-from@4.0.0':
+  '@smithy/util-buffer-from@3.0.0':
     dependencies:
-      '@smithy/is-array-buffer': 4.0.0
+      '@smithy/is-array-buffer': 3.0.0
       tslib: 2.6.2
 
   '@smithy/util-config-provider@2.3.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-config-provider@4.0.0':
+  '@smithy/util-config-provider@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12379,11 +12370,11 @@ snapshots:
       bowser: 2.11.0
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-browser@4.0.2':
+  '@smithy/util-defaults-mode-browser@3.0.25':
     dependencies:
-      '@smithy/property-provider': 4.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
+      '@smithy/property-provider': 3.1.8
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
       bowser: 2.11.0
       tslib: 2.6.2
 
@@ -12397,14 +12388,14 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-node@4.0.2':
+  '@smithy/util-defaults-mode-node@3.0.25':
     dependencies:
-      '@smithy/config-resolver': 4.0.1
-      '@smithy/credential-provider-imds': 4.0.1
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/property-provider': 4.0.1
-      '@smithy/smithy-client': 4.1.1
-      '@smithy/types': 4.1.0
+      '@smithy/config-resolver': 3.0.10
+      '@smithy/credential-provider-imds': 3.2.5
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/property-provider': 3.1.8
+      '@smithy/smithy-client': 3.4.2
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/util-endpoints@1.2.0':
@@ -12413,17 +12404,17 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/util-endpoints@3.0.1':
+  '@smithy/util-endpoints@2.1.4':
     dependencies:
-      '@smithy/node-config-provider': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/node-config-provider': 3.1.9
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/util-hex-encoding@2.2.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-hex-encoding@4.0.0':
+  '@smithy/util-hex-encoding@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12432,9 +12423,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/util-middleware@4.0.1':
+  '@smithy/util-middleware@3.0.8':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/util-retry@2.2.0':
@@ -12443,10 +12434,10 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/util-retry@4.0.1':
+  '@smithy/util-retry@3.0.8':
     dependencies:
-      '@smithy/service-error-classification': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/service-error-classification': 3.0.8
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@smithy/util-stream@2.2.0':
@@ -12460,15 +12451,15 @@ snapshots:
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@smithy/util-stream@4.0.1':
+  '@smithy/util-stream@3.2.1':
     dependencies:
-      '@smithy/fetch-http-handler': 5.0.1
-      '@smithy/node-http-handler': 4.0.1
-      '@smithy/types': 4.1.0
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-buffer-from': 4.0.0
-      '@smithy/util-hex-encoding': 4.0.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/fetch-http-handler': 4.0.0
+      '@smithy/node-http-handler': 3.2.5
+      '@smithy/types': 3.6.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/util-uri-escape@1.1.0':
@@ -12479,7 +12470,7 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-uri-escape@4.0.0':
+  '@smithy/util-uri-escape@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -12493,15 +12484,15 @@ snapshots:
       '@smithy/util-buffer-from': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/util-utf8@4.0.0':
+  '@smithy/util-utf8@3.0.0':
     dependencies:
-      '@smithy/util-buffer-from': 4.0.0
+      '@smithy/util-buffer-from': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/util-waiter@4.0.2':
+  '@smithy/util-waiter@3.1.7':
     dependencies:
-      '@smithy/abort-controller': 4.0.1
-      '@smithy/types': 4.1.0
+      '@smithy/abort-controller': 3.1.6
+      '@smithy/types': 3.6.0
       tslib: 2.6.2
 
   '@socket.io/component-emitter@3.1.2': {}
@@ -14732,7 +14723,7 @@ snapshots:
     dependencies:
       strnum: 1.0.5
 
-  fast-xml-parser@4.5.1:
+  fast-xml-parser@4.5.0:
     dependencies:
       strnum: 1.0.5
 
@@ -15061,7 +15052,7 @@ snapshots:
       - encoding
       - supports-color
 
-  google-auth-library@9.15.0(encoding@0.1.13):
+  google-auth-library@9.14.2(encoding@0.1.13):
     dependencies:
       base64-js: 1.5.1
       ecdsa-sig-formatter: 1.0.11
@@ -15249,7 +15240,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -16856,7 +16847,7 @@ snapshots:
 
   retry-request@4.2.2:
     dependencies:
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@5.5.0)
       extend: 3.0.2
     transitivePeerDependencies:
       - supports-color
@@ -17155,10 +17146,10 @@ snapshots:
 
   snowflake-sdk@1.15.0(asn1.js@5.4.1)(encoding@0.1.13):
     dependencies:
-      '@aws-sdk/client-s3': 3.726.1
+      '@aws-sdk/client-s3': 3.689.0
       '@aws-sdk/node-http-handler': 3.374.0
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
-      '@google-cloud/storage': 7.15.0(encoding@0.1.13)
+      '@google-cloud/storage': 7.14.0(encoding@0.1.13)
       '@techteamer/ocsp': 1.0.1
       asn1.js: 5.4.1
       asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
diff --git a/services/apps/data_sink_worker/config/custom-environment-variables.json b/services/apps/data_sink_worker/config/custom-environment-variables.json
index 7f0b6cd332..07554b54d9 100644
--- a/services/apps/data_sink_worker/config/custom-environment-variables.json
+++ b/services/apps/data_sink_worker/config/custom-environment-variables.json
@@ -30,5 +30,8 @@
   },
   "worker": {
     "queuePriorityLevel": "QUEUE_PRIORITY_LEVEL"
+  },
+  "github": {
+    "isSnowflakeEnabled": "CROWD_GITHUB_IS_SNOWFLAKE_ENABLED"
   }
 }
diff --git a/services/apps/data_sink_worker/src/conf/index.ts b/services/apps/data_sink_worker/src/conf/index.ts
index 55759a9f05..ec71246f7b 100644
--- a/services/apps/data_sink_worker/src/conf/index.ts
+++ b/services/apps/data_sink_worker/src/conf/index.ts
@@ -11,6 +11,10 @@ export interface ISlackAlertingConfig {
   url: string
 }
 
+export interface IGithubConfig {
+  isSnowflakeEnabled: string
+}
+
 export interface IWorkerConfig {
   maxStreamRetries: number
   queuePriorityLevel: QueuePriorityLevel
@@ -68,3 +72,11 @@ export const TEMPORAL_CONFIG = (): ITemporalConfig | undefined => {
 export const SEARCH_SYNC_API_CONFIG = (): ISearchSyncApiConfig => {
   return config.get<ISearchSyncApiConfig>('searchSyncApi')
 }
+
+let githubConfig: IGithubConfig
+export const GITHUB_CONFIG = (): IGithubConfig => {
+  if (githubConfig) return githubConfig
+
+  githubConfig = config.get<IGithubConfig>('github')
+  return githubConfig
+}
diff --git a/services/apps/data_sink_worker/src/service/activity.service.ts b/services/apps/data_sink_worker/src/service/activity.service.ts
index fd73f69832..c415243c68 100644
--- a/services/apps/data_sink_worker/src/service/activity.service.ts
+++ b/services/apps/data_sink_worker/src/service/activity.service.ts
@@ -44,11 +44,15 @@ import {
   PlatformType,
 } from '@crowd/types'
 
+import { GITHUB_CONFIG } from '../conf'
+
 import { IActivityCreateData, IActivityUpdateData, ISentimentActivityInput } from './activity.data'
 import { UnrepeatableError } from './common'
 import MemberService from './member.service'
 import MemberAffiliationService from './memberAffiliation.service'
 
+const IS_GITHUB_SNOWFLAKE_ENABLED = GITHUB_CONFIG().isSnowflakeEnabled === 'true'
+
 export default class ActivityService extends LoggerBase {
   constructor(
     private readonly pgStore: DbStore,
@@ -1094,13 +1098,16 @@ export default class ActivityService extends LoggerBase {
           )
         }
 
-        if (platform === PlatformType.GIT && activity.type === GitActivityType.AUTHORED_COMMIT) {
-          await this.pushAttributesToMatchingGithubActivity({ tenantId, segmentId, activity })
-        } else if (
-          platform === PlatformType.GITHUB &&
-          activity.type === GithubActivityType.PULL_REQUEST_OPENED
-        ) {
-          await this.pushPRSourceIdToMatchingGithubCommits({ tenantId, activity })
+        // if snowflake is enabled, we need to push attributes to matching github activity
+        if (IS_GITHUB_SNOWFLAKE_ENABLED) {
+          if (platform === PlatformType.GIT && activity.type === GitActivityType.AUTHORED_COMMIT) {
+            await this.pushAttributesToMatchingGithubActivity({ tenantId, segmentId, activity })
+          } else if (
+            platform === PlatformType.GITHUB &&
+            activity.type === GithubActivityType.PULL_REQUEST_OPENED
+          ) {
+            await this.pushPRSourceIdToMatchingGithubCommits({ tenantId, activity })
+          }
         }
       } finally {
         // release locks matter what
diff --git a/services/apps/integration_run_worker/config/custom-environment-variables.json b/services/apps/integration_run_worker/config/custom-environment-variables.json
index a36d299cf4..881c909be6 100644
--- a/services/apps/integration_run_worker/config/custom-environment-variables.json
+++ b/services/apps/integration_run_worker/config/custom-environment-variables.json
@@ -30,7 +30,8 @@
     "callbackUrl": "CROWD_GITHUB_CALLBACK_URL",
     "privateKey": "CROWD_GITHUB_PRIVATE_KEY",
     "webhookSecret": "CROWD_GITHUB_WEBHOOK_SECRET",
-    "isCommitDataEnabled": "CROWD_GITHUB_IS_COMMIT_DATA_ENABLED"
+    "isCommitDataEnabled": "CROWD_GITHUB_IS_COMMIT_DATA_ENABLED",
+    "isSnowflakeEnabled": "CROWD_GITHUB_IS_SNOWFLAKE_ENABLED"
   },
   "searchSyncApi": {
     "baseUrl": "CROWD_SEARCH_SYNC_API_URL"
diff --git a/services/apps/integration_run_worker/src/bin/auto-heal-github-integration.ts b/services/apps/integration_run_worker/src/bin/auto-heal-github-integration.ts
index 5abdf8cb4d..04101be73e 100644
--- a/services/apps/integration_run_worker/src/bin/auto-heal-github-integration.ts
+++ b/services/apps/integration_run_worker/src/bin/auto-heal-github-integration.ts
@@ -188,7 +188,7 @@ setImmediate(async () => {
     const repos: Repo[] = []
 
     for (const repoFullName of repoFullNames) {
-      const repoExists = currentSettings.repos.find((r) => r.url === repoFullName)
+      const repoExists = currentSettings.orgs[0].repos.find((r) => r.url === repoFullName)
       if (!repoExists) {
         log.error(`Repo ${repoFullName} is not configured in integration settings, skipping!`)
         continue
@@ -220,7 +220,16 @@ setImmediate(async () => {
 
     const settings: GithubManualIntegrationSettings = {
       manualSettingsType: 'detailed_map',
-      repos,
+      orgs: [
+        {
+          name: currentSettings.orgs[0].name,
+          logo: currentSettings.orgs[0].logo,
+          url: currentSettings.orgs[0].url,
+          fullSync: currentSettings.orgs[0].fullSync,
+          updatedAt: currentSettings.orgs[0].updatedAt,
+          repos,
+        },
+      ],
       unavailableRepos: [],
       map: mapToObject(detailedMap),
     }
diff --git a/services/apps/integration_run_worker/src/bin/process-repo.ts b/services/apps/integration_run_worker/src/bin/process-repo.ts
index b5adf3ba17..76d46eb406 100644
--- a/services/apps/integration_run_worker/src/bin/process-repo.ts
+++ b/services/apps/integration_run_worker/src/bin/process-repo.ts
@@ -112,12 +112,12 @@ setImmediate(async () => {
     )) as GithubIntegrationSettings
 
     let repos = []
-    if (repoFullNames[0] === 'all' && currentSettings.repos) {
-      repos = currentSettings.repos
+    if (repoFullNames[0] === 'all' && currentSettings.orgs[0].repos) {
+      repos = currentSettings.orgs[0].repos
     } else {
       for (const repoFullName of repoFullNames) {
         const repoURL = `https://github.com/${repoFullName}`
-        const repoExists = currentSettings.repos.find((r) => r.url === repoURL)
+        const repoExists = currentSettings.orgs[0].repos.find((r) => r.url === repoURL)
         if (!repoExists) {
           log.error(`Repo ${repoURL} is not configured in integration settings, skipping!`)
           continue
@@ -133,7 +133,16 @@ setImmediate(async () => {
 
     const settings: GithubManualIntegrationSettings = {
       manualSettingsType: 'default',
-      repos,
+      orgs: [
+        {
+          name: currentSettings.orgs[0].name,
+          logo: currentSettings.orgs[0].logo,
+          url: currentSettings.orgs[0].url,
+          fullSync: currentSettings.orgs[0].fullSync,
+          updatedAt: currentSettings.orgs[0].updatedAt,
+          repos,
+        },
+      ],
       unavailableRepos: [],
       streamType,
     }
diff --git a/services/apps/integration_run_worker/src/service/integrationRunService.ts b/services/apps/integration_run_worker/src/service/integrationRunService.ts
index 179c20483d..28dea4a676 100644
--- a/services/apps/integration_run_worker/src/service/integrationRunService.ts
+++ b/services/apps/integration_run_worker/src/service/integrationRunService.ts
@@ -10,10 +10,13 @@ import MemberAttributeSettingsRepository from '@crowd/data-access-layer/src/old/
 import { IGenerateStreamsContext, INTEGRATION_SERVICES } from '@crowd/integrations'
 import { Logger, LoggerBase, getChildLogger } from '@crowd/logging'
 import { ApiPubSubEmitter, RedisCache, RedisClient } from '@crowd/redis'
-import { IntegrationRunState, IntegrationStreamState } from '@crowd/types'
+import { IntegrationRunState, IntegrationStreamState, PlatformType } from '@crowd/types'
 
 import { NANGO_CONFIG, PLATFORM_CONFIG, WORKER_CONFIG } from '../conf'
 
+const isSnowflakeEnabled =
+  (PLATFORM_CONFIG('github') as Record<string, unknown>)?.isSnowflakeEnabled === 'true'
+
 export default class IntegrationRunService extends LoggerBase {
   private readonly repo: IntegrationRunRepository
 
@@ -257,11 +260,18 @@ export default class IntegrationRunService extends LoggerBase {
       return
     }
 
-    const integrationService = singleOrDefault(
+    let integrationService = singleOrDefault(
       INTEGRATION_SERVICES,
       (i) => i.type === runInfo.integrationType,
     )
 
+    if (isSnowflakeEnabled && runInfo.integrationType === PlatformType.GITHUB) {
+      integrationService = singleOrDefault(
+        INTEGRATION_SERVICES,
+        (i) => i.type === PlatformType.GITHUB_SNOWFLAKE,
+      )
+    }
+
     if (!integrationService) {
       this.log.error({ type: runInfo.integrationType }, 'Could not find integration service!')
       await this.triggerRunError(
diff --git a/services/apps/integration_stream_worker/config/custom-environment-variables.json b/services/apps/integration_stream_worker/config/custom-environment-variables.json
index 4603601cbf..168531f1b5 100644
--- a/services/apps/integration_stream_worker/config/custom-environment-variables.json
+++ b/services/apps/integration_stream_worker/config/custom-environment-variables.json
@@ -44,7 +44,8 @@
     "isCommitDataEnabled": "CROWD_GITHUB_IS_COMMIT_DATA_ENABLED",
     "personalAccessTokens": "CROWD_GITHUB_PERSONAL_ACCESS_TOKENS",
     "tgNotifierToken": "CROWD_TG_NOTIFIER_TOKEN",
-    "tgNotifierChatId": "CROWD_TG_NOTIFIER_CHAT_ID"
+    "tgNotifierChatId": "CROWD_TG_NOTIFIER_CHAT_ID",
+    "isSnowflakeEnabled": "CROWD_GITHUB_IS_SNOWFLAKE_ENABLED"
   },
   "gitlab": {
     "clientId": "CROWD_GITLAB_CLIENT_ID",
diff --git a/services/apps/integration_stream_worker/src/service/integrationDataService.ts b/services/apps/integration_stream_worker/src/service/integrationDataService.ts
index b3f60b2152..89b7e646d2 100644
--- a/services/apps/integration_stream_worker/src/service/integrationDataService.ts
+++ b/services/apps/integration_stream_worker/src/service/integrationDataService.ts
@@ -6,10 +6,13 @@ import IntegrationStreamRepository from '@crowd/data-access-layer/src/old/apps/i
 import { INTEGRATION_SERVICES, IProcessDataContext } from '@crowd/integrations'
 import { Logger, LoggerBase } from '@crowd/logging'
 import { RedisCache, RedisClient } from '@crowd/redis'
-import { IActivityData, IntegrationResultType } from '@crowd/types'
+import { IActivityData, IntegrationResultType, PlatformType } from '@crowd/types'
 
 import { PLATFORM_CONFIG } from '../conf'
 
+const isSnowflakeEnabled =
+  (PLATFORM_CONFIG('github') as Record<string, unknown>)?.isSnowflakeEnabled === 'true'
+
 export default class IntegrationDataService extends LoggerBase {
   private repo: IntegrationStreamRepository
 
@@ -26,11 +29,18 @@ export default class IntegrationDataService extends LoggerBase {
   }
 
   public async processData(data: unknown, stream: IStreamData): Promise<void> {
-    const integrationService = singleOrDefault(
+    let integrationService = singleOrDefault(
       INTEGRATION_SERVICES,
       (i) => i.type === stream.integrationType,
     )
 
+    if (isSnowflakeEnabled && stream.integrationType === PlatformType.GITHUB) {
+      integrationService = singleOrDefault(
+        INTEGRATION_SERVICES,
+        (i) => i.type === PlatformType.GITHUB_SNOWFLAKE,
+      )
+    }
+
     if (!integrationService) {
       this.log.error({ type: stream.integrationType }, 'Could not find integration service!')
       throw new Error('Could not find integration service to process API data!')
diff --git a/services/apps/integration_stream_worker/src/service/integrationStreamService.ts b/services/apps/integration_stream_worker/src/service/integrationStreamService.ts
index 41a37e22f5..c031c8f7d1 100644
--- a/services/apps/integration_stream_worker/src/service/integrationStreamService.ts
+++ b/services/apps/integration_stream_worker/src/service/integrationStreamService.ts
@@ -19,6 +19,7 @@ import {
   IntegrationRunState,
   IntegrationState,
   IntegrationStreamType,
+  PlatformType,
   RateLimitError,
   WebhookType,
 } from '@crowd/types'
@@ -27,6 +28,9 @@ import { NANGO_CONFIG, PLATFORM_CONFIG, WORKER_SETTINGS } from '../conf'
 
 import IntegrationDataService from './integrationDataService'
 
+const isSnowflakeEnabled =
+  (PLATFORM_CONFIG('github') as Record<string, unknown>)?.isSnowflakeEnabled === 'true'
+
 export default class IntegrationStreamService extends LoggerBase {
   private readonly repo: IntegrationStreamRepository
   private readonly webhookRepo: IncomingWebhookRepository
@@ -243,11 +247,18 @@ export default class IntegrationStreamService extends LoggerBase {
       platform: streamInfo.integrationType,
     })
 
-    const integrationService = singleOrDefault(
+    let integrationService = singleOrDefault(
       INTEGRATION_SERVICES,
       (i) => i.type === streamInfo.integrationType,
     )
 
+    if (isSnowflakeEnabled && streamInfo.integrationType === PlatformType.GITHUB) {
+      integrationService = singleOrDefault(
+        INTEGRATION_SERVICES,
+        (i) => i.type === PlatformType.GITHUB_SNOWFLAKE,
+      )
+    }
+
     if (!integrationService) {
       this.log.error({ type: streamInfo.integrationType }, 'Could not find integration service!')
       await this.triggerStreamError(
@@ -428,11 +439,18 @@ export default class IntegrationStreamService extends LoggerBase {
       platform: streamInfo.integrationType,
     })
 
-    const integrationService = singleOrDefault(
+    let integrationService = singleOrDefault(
       INTEGRATION_SERVICES,
       (i) => i.type === streamInfo.integrationType,
     )
 
+    if (isSnowflakeEnabled && streamInfo.integrationType === PlatformType.GITHUB) {
+      integrationService = singleOrDefault(
+        INTEGRATION_SERVICES,
+        (i) => i.type === PlatformType.GITHUB_SNOWFLAKE,
+      )
+    }
+
     if (!integrationService) {
       this.log.error({ type: streamInfo.integrationType }, 'Could not find integration service!')
       await this.triggerStreamError(
diff --git a/services/apps/webhook_api/src/routes/github.ts b/services/apps/webhook_api/src/routes/github.ts
index cf1e8c28f6..260d98adaa 100644
--- a/services/apps/webhook_api/src/routes/github.ts
+++ b/services/apps/webhook_api/src/routes/github.ts
@@ -30,7 +30,19 @@ export const installGithubRoutes = async (app: express.Express) => {
       const identifier = data.installation.id.toString()
       const repo = new WebhooksRepository(req.dbStore, req.log)
 
-      if (event === 'installation') {
+      if (event === 'installation' && data.action === 'created') {
+        await repo.addGithubInstallation(
+          identifier,
+          data.installation.account.type,
+          data.installation.account.login,
+          data.installation.account.avatar_url,
+          data.repositories.length,
+        )
+        res.sendStatus(204)
+        return
+      }
+      if (event === 'installation' && data.action === 'deleted') {
+        await repo.deleteGithubInstallation(identifier)
         res.sendStatus(204)
         return
       }
diff --git a/services/libs/integrations/src/integrations/activityTypes.ts b/services/libs/integrations/src/integrations/activityTypes.ts
index 0d160444c4..0a541431f7 100644
--- a/services/libs/integrations/src/integrations/activityTypes.ts
+++ b/services/libs/integrations/src/integrations/activityTypes.ts
@@ -10,8 +10,8 @@ import { DISCOURSE_GRID } from './discourse/grid'
 import { DiscourseActivityType } from './discourse/types'
 import { GerritActivityType } from './gerrit/types'
 import { GitActivityType } from './git/types'
-import { GITHUB_GRID } from './github-old/grid'
-import { GithubActivityType } from './github-old/types'
+import { GITHUB_GRID } from './github/grid'
+import { GithubActivityType } from './github/types'
 import { GITLAB_GRID } from './gitlab/grid'
 import { GitlabActivityType } from './gitlab/types'
 import { Groupsio_GRID } from './groupsio/grid'
diff --git a/services/libs/integrations/src/integrations/devto/memberAttributes.ts b/services/libs/integrations/src/integrations/devto/memberAttributes.ts
index 41711a7853..c516e784f5 100644
--- a/services/libs/integrations/src/integrations/devto/memberAttributes.ts
+++ b/services/libs/integrations/src/integrations/devto/memberAttributes.ts
@@ -6,7 +6,7 @@ import {
   MemberAttributes,
 } from '@crowd/types'
 
-import { GITHUB_MEMBER_ATTRIBUTES } from '../github-old/memberAttributes'
+import { GITHUB_MEMBER_ATTRIBUTES } from '../github/memberAttributes'
 import { TWITTER_MEMBER_ATTRIBUTES } from '../twitter/memberAttributes'
 import { pickAttributes } from '../utils'
 
diff --git a/services/libs/integrations/src/integrations/github-old/generateStreams.ts b/services/libs/integrations/src/integrations/github-old/generateStreams.ts
deleted file mode 100644
index 2a6a8bf40f..0000000000
--- a/services/libs/integrations/src/integrations/github-old/generateStreams.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { GenerateStreamsHandler } from '../../types'
-
-import {
-  GithubBasicStream,
-  GithubIntegrationSettings,
-  GithubManualIntegrationSettings,
-  GithubManualStreamType,
-  GithubRootStream,
-  GithubStreamType,
-} from './types'
-
-const streamToManualStreamMap: Map<GithubStreamType, GithubManualStreamType> = new Map([
-  [GithubStreamType.STARGAZERS, GithubManualStreamType.STARGAZERS],
-  [GithubStreamType.FORKS, GithubManualStreamType.FORKS],
-  [GithubStreamType.PULLS, GithubManualStreamType.PULLS],
-  [GithubStreamType.ISSUES, GithubManualStreamType.ISSUES],
-  [GithubStreamType.DISCUSSIONS, GithubManualStreamType.DISCUSSIONS],
-])
-
-const manualStreamToStreamMap: Map<GithubManualStreamType, GithubStreamType> = new Map([
-  [GithubManualStreamType.STARGAZERS, GithubStreamType.STARGAZERS],
-  [GithubManualStreamType.FORKS, GithubStreamType.FORKS],
-  [GithubManualStreamType.PULLS, GithubStreamType.PULLS],
-  [GithubManualStreamType.ISSUES, GithubStreamType.ISSUES],
-  [GithubManualStreamType.DISCUSSIONS, GithubStreamType.DISCUSSIONS],
-])
-
-const objectToMap = (obj: object): Map<string, Array<GithubManualStreamType>> => {
-  const map = new Map<string, Array<GithubManualStreamType>>()
-  for (const [key, value] of Object.entries(obj)) {
-    map.set(key, value)
-  }
-  return map
-}
-
-const handler: GenerateStreamsHandler = async (ctx) => {
-  const settings = ctx.integration.settings as GithubIntegrationSettings
-  const reposToCheck = [...(settings.repos || []), ...(settings.unavailableRepos || [])]
-
-  const isManualRun = ctx.isManualRun
-
-  if (isManualRun) {
-    const manualSettings = ctx.manualSettings as GithubManualIntegrationSettings
-    if (!manualSettings) {
-      ctx.abortRunWithError('isManualRun is true but manualSettings is not set!')
-    }
-
-    if (manualSettings.repos && manualSettings.manualSettingsType === 'default') {
-      for (const repo of manualSettings.repos) {
-        for (const endpoint of [
-          GithubStreamType.STARGAZERS,
-          GithubStreamType.FORKS,
-          GithubStreamType.PULLS,
-          GithubStreamType.ISSUES,
-          GithubStreamType.DISCUSSIONS,
-        ]) {
-          if (
-            manualSettings.streamType === GithubManualStreamType.ALL ||
-            manualSettings.streamType === streamToManualStreamMap.get(endpoint)
-          ) {
-            await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
-              repo,
-              page: '',
-            })
-          }
-        }
-      }
-    } else if (manualSettings.repos && manualSettings.manualSettingsType === 'detailed_map') {
-      const map = objectToMap(manualSettings.map)
-      for (const [repoUrl, streams] of map) {
-        for (const stream of streams) {
-          const endpoint = manualStreamToStreamMap.get(stream)
-          if (!endpoint) {
-            ctx.abortRunWithError(`Invalid stream type: ${stream}`)
-          }
-          const repo = manualSettings.repos.find((r) => r.url === repoUrl)
-          await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
-            repo,
-            page: '',
-          })
-        }
-      }
-    }
-
-    return
-  }
-
-  // not manual run, executing normal run
-  await ctx.publishStream<GithubRootStream>(GithubStreamType.ROOT, {
-    reposToCheck,
-  })
-}
-
-export default handler
diff --git a/services/libs/integrations/src/integrations/github-old/processData.ts b/services/libs/integrations/src/integrations/github-old/processData.ts
deleted file mode 100644
index 092471a3e0..0000000000
--- a/services/libs/integrations/src/integrations/github-old/processData.ts
+++ /dev/null
@@ -1,1524 +0,0 @@
-/* eslint-disable  @typescript-eslint/no-explicit-any */
-// processStream.ts content
-// processData.ts content
-import {
-  IActivityData,
-  IActivityScoringGrid,
-  IMemberData,
-  IOrganization,
-  MemberAttributeName,
-  MemberIdentityType,
-  OrganizationIdentityType,
-  OrganizationSource,
-  PlatformType,
-} from '@crowd/types'
-
-import { generateSourceIdHash } from '../../helpers'
-import { IProcessDataContext, ProcessDataHandler } from '../../types'
-
-import { GITHUB_GRID } from './grid'
-import {
-  GithubActivitySubType,
-  GithubActivityType,
-  GithubApiData,
-  GithubIssue,
-  GithubIssueTimelineItem,
-  GithubPrepareMemberOutput,
-  GithubPrepareOrgMemberOutput,
-  GithubPullRequest,
-  GithubPullRequestTimelineItem,
-  GithubWebhookData,
-  GithubWehookEvent,
-  INDIRECT_FORK,
-} from './types'
-
-const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
-
-const parseBotMember = (memberData: GithubPrepareMemberOutput): IMemberData => {
-  const member: IMemberData = {
-    identities: [
-      {
-        platform: PlatformType.GITHUB,
-        value: memberData.memberFromApi.login,
-        type: MemberIdentityType.USERNAME,
-        verified: true,
-      },
-    ],
-    displayName: memberData.memberFromApi.login,
-    attributes: {
-      [MemberAttributeName.URL]: {
-        [PlatformType.GITHUB]: memberData.memberFromApi?.url || '',
-      },
-      [MemberAttributeName.AVATAR_URL]: {
-        [PlatformType.GITHUB]: memberData.memberFromApi?.avatarUrl || '',
-      },
-      [MemberAttributeName.SOURCE_ID]: {
-        [PlatformType.GITHUB]: memberData.memberFromApi?.id?.toString() || '',
-      },
-      [MemberAttributeName.IS_BOT]: {
-        [PlatformType.GITHUB]: true,
-      },
-    },
-  }
-
-  return member
-}
-
-const parseDeletedMember = (memberData: GithubPrepareMemberOutput): IMemberData => {
-  const member: IMemberData = {
-    identities: [
-      {
-        platform: PlatformType.GITHUB,
-        value: memberData.memberFromApi.login,
-        type: MemberIdentityType.USERNAME,
-        verified: true,
-      },
-    ],
-    displayName: 'Deleted User',
-    attributes: {
-      [MemberAttributeName.URL]: {
-        [PlatformType.GITHUB]: memberData.memberFromApi?.url || '',
-      },
-      [MemberAttributeName.AVATAR_URL]: {
-        [PlatformType.GITHUB]: memberData.memberFromApi?.avatarUrl || '',
-      },
-      [MemberAttributeName.BIO]: {
-        [PlatformType.GITHUB]:
-          "Hi, I'm @ghost! I take the place of user accounts that have been deleted. :ghost:",
-      },
-    },
-  }
-
-  return member
-}
-
-const parseMember = (memberData: GithubPrepareMemberOutput): IMemberData => {
-  const { email, orgs, memberFromApi } = memberData
-
-  if (memberFromApi.isBot && memberFromApi.isDeleted) {
-    throw new Error('Member cannot be both bot and deleted')
-  }
-
-  if (memberFromApi.isBot) {
-    return parseBotMember(memberData)
-  }
-
-  if (memberFromApi.isDeleted) {
-    return parseDeletedMember(memberData)
-  }
-
-  const member: IMemberData = {
-    identities: [
-      {
-        platform: PlatformType.GITHUB,
-        value: memberFromApi.login,
-        type: MemberIdentityType.USERNAME,
-        sourceId: memberFromApi.id.toString(),
-        verified: true,
-      },
-    ],
-    displayName: memberFromApi?.name?.trim() || memberFromApi.login,
-    attributes: {
-      [MemberAttributeName.IS_HIREABLE]: {
-        [PlatformType.GITHUB]: memberFromApi.isHireable || false,
-      },
-      [MemberAttributeName.URL]: {
-        [PlatformType.GITHUB]: memberFromApi.url,
-      },
-      [MemberAttributeName.BIO]: {
-        [PlatformType.GITHUB]: memberFromApi.bio || '',
-      },
-      [MemberAttributeName.LOCATION]: {
-        [PlatformType.GITHUB]: memberFromApi.location || '',
-      },
-      [MemberAttributeName.AVATAR_URL]: {
-        [PlatformType.GITHUB]: memberFromApi.avatarUrl || '',
-      },
-      [MemberAttributeName.COMPANY]: {
-        [PlatformType.GITHUB]: memberFromApi.company || '',
-      },
-    },
-  }
-
-  if (email) {
-    member.identities.push({
-      platform: PlatformType.GITHUB,
-      value: email,
-      type: MemberIdentityType.EMAIL,
-      verified: true,
-    })
-  }
-
-  if (memberFromApi?.twitterUsername) {
-    member.identities.push({
-      platform: PlatformType.TWITTER,
-      value: memberFromApi.twitterUsername,
-      type: MemberIdentityType.USERNAME,
-      verified: false,
-    })
-  }
-
-  if (memberFromApi.websiteUrl) {
-    member.attributes[MemberAttributeName.WEBSITE_URL] = {
-      [PlatformType.GITHUB]: memberFromApi.websiteUrl,
-    }
-  }
-
-  if (memberFromApi.company) {
-    if (IS_TEST_ENV) {
-      member.organizations = [
-        {
-          attributes: {
-            name: {
-              integration: ['crowd.dev'],
-            },
-          },
-          identities: [
-            {
-              value: 'crowd.dev',
-              platform: PlatformType.GITHUB,
-              type: OrganizationIdentityType.USERNAME,
-              verified: true,
-            },
-          ],
-          source: OrganizationSource.GITHUB,
-        },
-      ]
-    } else {
-      const company = memberFromApi.company.replace('@', '').trim()
-
-      if (orgs && company.length > 0) {
-        const organizationPayload = {
-          displayName: orgs.name,
-          names: [orgs.name],
-          identities: [
-            {
-              platform: PlatformType.GITHUB,
-              type: OrganizationIdentityType.USERNAME,
-              value: orgs.url.replace('https://github.com/', ''),
-              verified: true,
-            },
-          ],
-          description: orgs.description ?? null,
-          location: orgs.location ?? null,
-          logo: orgs.avatarUrl ?? null,
-          source: OrganizationSource.GITHUB,
-        } as IOrganization
-
-        if (orgs.websiteUrl) {
-          organizationPayload.identities.push({
-            platform: PlatformType.GITHUB,
-            type: OrganizationIdentityType.PRIMARY_DOMAIN,
-            value: orgs.websiteUrl,
-            verified: false,
-          })
-        }
-
-        if (orgs.twitterUsername) {
-          organizationPayload.identities.push({
-            platform: PlatformType.TWITTER,
-            type: OrganizationIdentityType.USERNAME,
-            value: orgs.twitterUsername,
-            verified: false,
-          })
-        }
-
-        member.organizations = [organizationPayload]
-      }
-    }
-  }
-
-  // if (memberFromApi.followers && memberFromApi.followers.totalCount > 0) {
-  //   member.reach = { [PlatformType.GITHUB]: memberFromApi.followers.totalCount }
-  // }
-
-  return member
-}
-
-const parseOrgMember = (memberData: GithubPrepareOrgMemberOutput): IMemberData => {
-  const { orgFromApi } = memberData
-
-  const member: IMemberData = {
-    identities: [
-      {
-        platform: PlatformType.GITHUB,
-        value: orgFromApi.login,
-        type: MemberIdentityType.USERNAME,
-        verified: true,
-      },
-    ],
-    displayName: orgFromApi?.name?.trim() || orgFromApi.login,
-    attributes: {
-      [MemberAttributeName.URL]: {
-        [PlatformType.GITHUB]: orgFromApi.url,
-      },
-      [MemberAttributeName.BIO]: {
-        [PlatformType.GITHUB]: orgFromApi.description || '',
-      },
-      [MemberAttributeName.LOCATION]: {
-        [PlatformType.GITHUB]: orgFromApi.location || '',
-      },
-      [MemberAttributeName.AVATAR_URL]: {
-        [PlatformType.GITHUB]: orgFromApi.avatarUrl || '',
-      },
-    },
-  }
-
-  if (orgFromApi.email) {
-    member.identities.push({
-      platform: PlatformType.GITHUB,
-      value: orgFromApi.email,
-      type: MemberIdentityType.EMAIL,
-      verified: true,
-    })
-  }
-
-  if (orgFromApi?.twitterUsername) {
-    member.identities.push({
-      platform: PlatformType.TWITTER,
-      value: orgFromApi.twitterUsername,
-      type: MemberIdentityType.USERNAME,
-      verified: false,
-    })
-  }
-
-  if (orgFromApi.websiteUrl) {
-    member.attributes[MemberAttributeName.WEBSITE_URL] = {
-      [PlatformType.GITHUB]: orgFromApi.websiteUrl,
-    }
-  }
-
-  // mark as organization
-  member.attributes[MemberAttributeName.IS_ORGANIZATION] = {
-    [PlatformType.GITHUB]: true,
-  }
-
-  return member
-}
-
-const parseStar: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.STAR,
-    sourceId: generateSourceIdHash(
-      data.node.login,
-      GithubActivityType.STAR,
-      Math.floor(new Date(data.starredAt).getTime() / 1000).toString(),
-      PlatformType.GITHUB,
-    ),
-    sourceParentId: '',
-    timestamp: new Date(data.starredAt).toISOString(),
-    channel: apiData.repo.url,
-    member,
-    score: GITHUB_GRID.star.score,
-    isContribution: GITHUB_GRID.star.isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseFork: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-
-  if (apiData.orgMember && !apiData.member) {
-    await parseForkByOrg(ctx)
-    return
-  } else if (apiData.member && apiData.orgMember) {
-    throw new Error('Both member and orgMember are present')
-  } else if (!apiData.member && !apiData.orgMember) {
-    throw new Error('Both member and orgMember are missing')
-  }
-
-  const data = apiData.data
-  const relatedData = apiData.relatedData
-  const memberData = apiData.member
-  const subType = apiData.subType
-
-  const member = parseMember(memberData)
-
-  if (subType && subType === INDIRECT_FORK) {
-    const activity: IActivityData = {
-      type: GithubActivityType.FORK,
-      sourceId: data.id,
-      sourceParentId: '',
-      timestamp: new Date(data.createdAt).toISOString(),
-      channel: apiData.repo.url,
-      member,
-      score: GITHUB_GRID.fork.score,
-      isContribution: GITHUB_GRID.fork.isContribution,
-      attributes: {
-        isIndirectFork: true,
-        directParent: relatedData.url,
-      },
-    }
-
-    await ctx.publishActivity(activity)
-    return
-  }
-
-  const activity: IActivityData = {
-    type: GithubActivityType.FORK,
-    sourceId: data.id,
-    sourceParentId: '',
-    timestamp: new Date(data.createdAt).toISOString(),
-    channel: apiData.repo.url,
-    member,
-    score: GITHUB_GRID.fork.score,
-    isContribution: GITHUB_GRID.fork.isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseForkByOrg: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const relatedData = apiData.relatedData
-  const memberData = apiData.orgMember
-  const subType = apiData.subType
-
-  const member = parseOrgMember(memberData)
-
-  if (subType && subType === INDIRECT_FORK) {
-    const activity: IActivityData = {
-      type: GithubActivityType.FORK,
-      sourceId: data.id,
-      sourceParentId: '',
-      timestamp: new Date(data.createdAt).toISOString(),
-      channel: apiData.repo.url,
-      member,
-      score: GITHUB_GRID.fork.score,
-      isContribution: GITHUB_GRID.fork.isContribution,
-      attributes: {
-        isIndirectFork: true,
-        directParent: relatedData.url,
-        isForkByOrg: true,
-      },
-    }
-
-    await ctx.publishActivity(activity)
-    return
-  }
-
-  const activity: IActivityData = {
-    type: GithubActivityType.FORK,
-    sourceId: data.id,
-    sourceParentId: '',
-    timestamp: new Date(data.createdAt).toISOString(),
-    channel: apiData.repo.url,
-    member,
-    score: GITHUB_GRID.fork.score,
-    isContribution: GITHUB_GRID.fork.isContribution,
-    attributes: {
-      isForkByOrg: true,
-    },
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestOpened: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubPullRequest
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_OPENED,
-    sourceId: data.id,
-    sourceParentId: '',
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: data.bodyText,
-    url: data.url ? data.url : '',
-    channel: apiData.repo.url,
-    title: data.title,
-    attributes: {
-      state: data.state.toLowerCase(),
-      additions: data.additions,
-      deletions: data.deletions,
-      changedFiles: data.changedFiles,
-      authorAssociation: data.authorAssociation,
-      labels: data.labels?.nodes.map((l) => l.name),
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestClosed: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubPullRequestTimelineItem
-  const relatedData = apiData.relatedData as GithubPullRequest
-  const memberData = apiData.member
-  const repo = apiData.repo
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_CLOSED,
-    sourceId: `gen-CE_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
-      data.createdAt,
-    ).toISOString()}`,
-    sourceParentId: relatedData.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: '',
-    url: relatedData.url ? relatedData.url : '',
-    channel: repo.url,
-    title: '',
-    attributes: {
-      state: relatedData.state.toLowerCase(),
-      additions: relatedData.additions,
-      deletions: relatedData.deletions,
-      changedFiles: relatedData.changedFiles,
-      authorAssociation: relatedData.authorAssociation,
-      labels: relatedData.labels?.nodes.map((l) => l.name),
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestReviewRequested: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubPullRequestTimelineItem
-  const relatedData = apiData.relatedData as GithubPullRequest
-  const memberData = apiData.member
-  const objectMemberData = apiData.objectMember
-
-  const member = parseMember(memberData)
-  const objectMember = parseMember(objectMemberData)
-
-  const subType = apiData.subType
-
-  const sourceId =
-    subType === GithubActivitySubType.PULL_REQUEST_REVIEW_REQUESTED_SINGLE
-      ? `gen-RRE_${relatedData.id}_${memberData.memberFromApi.login}_${
-          objectMemberData.memberFromApi.login
-        }_${new Date(data.createdAt).toISOString()}`
-      : `gen-RRE_${relatedData.id}_${memberData.memberFromApi.login}_${
-          objectMemberData.memberFromApi.login
-        }_${new Date(data.createdAt).toISOString()}`
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED,
-    sourceId: sourceId,
-    sourceParentId: relatedData.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: '',
-    url: relatedData.url,
-    channel: apiData.repo.url,
-    title: '',
-    attributes: {
-      state: relatedData.state.toLowerCase(),
-      additions: relatedData.additions,
-      deletions: relatedData.deletions,
-      changedFiles: relatedData.changedFiles,
-      authorAssociation: relatedData.authorAssociation,
-      labels: relatedData.labels?.nodes.map((l) => l.name),
-    },
-    member,
-    objectMember,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestReviewed: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubPullRequestTimelineItem
-  const relatedData = apiData.relatedData as GithubPullRequest
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_REVIEWED,
-    sourceId: `gen-PRR_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
-      data.submittedAt,
-    ).toISOString()}`,
-    sourceParentId: relatedData.id,
-    timestamp: new Date(data.submittedAt).toISOString(),
-    url: relatedData.url,
-    channel: apiData.repo.url,
-    body: data.body,
-    title: '',
-    attributes: {
-      reviewState: data.state,
-      state: relatedData.state.toLowerCase(),
-      additions: relatedData.additions,
-      deletions: relatedData.deletions,
-      changedFiles: relatedData.changedFiles,
-      authorAssociation: relatedData.authorAssociation,
-      labels: relatedData.labels,
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestAssigned: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubPullRequestTimelineItem
-  const relatedData = apiData.relatedData as GithubPullRequest
-  const memberData = apiData.member
-  const objectMemberData = apiData.objectMember
-
-  const member = parseMember(memberData)
-  const objectMember = parseMember(objectMemberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_ASSIGNED,
-    sourceId: `gen-AE_${relatedData.id}_${memberData.memberFromApi.login}_${
-      objectMemberData.memberFromApi.login
-    }_${new Date(data.createdAt).toISOString()}`,
-    sourceParentId: relatedData.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: '',
-    url: relatedData.url,
-    channel: apiData.repo.url,
-    title: '',
-    attributes: {
-      state: relatedData.state.toLowerCase(),
-      additions: relatedData.additions,
-      deletions: relatedData.deletions,
-      changedFiles: relatedData.changedFiles,
-      authorAssociation: relatedData.authorAssociation,
-      labels: relatedData.labels?.nodes?.map((l) => l.name),
-    },
-    member,
-    objectMember,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_ASSIGNED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_ASSIGNED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestMerged: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubPullRequestTimelineItem
-  const relatedData = apiData.relatedData as GithubPullRequest
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_MERGED,
-    sourceId: `gen-ME_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
-      data.createdAt,
-    ).toISOString()}`,
-    sourceParentId: relatedData.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: '',
-    url: relatedData.url,
-    channel: apiData.repo.url,
-    title: '',
-    attributes: {
-      state: relatedData.state.toLowerCase(),
-      additions: relatedData.additions,
-      deletions: relatedData.deletions,
-      changedFiles: relatedData.changedFiles,
-      authorAssociation: relatedData.authorAssociation,
-      labels: relatedData.labels?.nodes.map((l) => l.name),
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseIssueOpened: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubIssue
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.ISSUE_OPENED,
-    sourceId: data.id,
-    sourceParentId: '',
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: data.bodyText,
-    url: data.url ? data.url : '',
-    channel: apiData.repo.url,
-    title: data.title.replace(/\0/g, ''),
-    attributes: {
-      state: data.state.toLowerCase(),
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.ISSUE_OPENED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.ISSUE_OPENED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseIssueClosed: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data as GithubIssueTimelineItem
-  const relatedData = apiData.relatedData as GithubIssue
-  const memberData = apiData.member
-  const repo = apiData.repo
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.ISSUE_CLOSED,
-    sourceId: `gen-CE_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
-      data.createdAt,
-    ).toISOString()}`,
-    sourceParentId: relatedData.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: '',
-    url: relatedData.url ? relatedData.url : '',
-    channel: repo.url,
-    title: '',
-    attributes: {
-      state: relatedData.state.toLowerCase(),
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.ISSUE_CLOSED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.ISSUE_CLOSED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestComment: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_COMMENT,
-    sourceId: data.id,
-    sourceParentId: data.pullRequest.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    url: data.url,
-    body: data.bodyText,
-    channel: apiData.repo.url,
-    member,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_COMMENT].score,
-    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_COMMENT].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parsePullRequestReviewThreadComment: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT,
-    sourceId: data.id,
-    sourceParentId: data.pullRequest.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: data.bodyText,
-    url: data.url,
-    channel: apiData.repo.url,
-    title: '',
-    attributes: {
-      state: data.pullRequest.state.toLowerCase(),
-      additions: data.pullRequest.additions,
-      deletions: data.pullRequest.deletions,
-      changedFiles: data.pullRequest.changedFiles,
-      authorAssociation: data.pullRequest.authorAssociation,
-      labels: data.pullRequest.labels?.nodes.map((l) => l.name),
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT].score,
-    isContribution:
-      GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseIssueComment: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.ISSUE_COMMENT,
-    sourceId: data.id,
-    sourceParentId: data.issue.id,
-    timestamp: new Date(data.createdAt).toISOString(),
-    url: data.url,
-    body: data.bodyText,
-    channel: apiData.repo.url,
-    member,
-    score: GITHUB_GRID[GithubActivityType.ISSUE_COMMENT].score,
-    isContribution: GITHUB_GRID[GithubActivityType.ISSUE_COMMENT].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseDiscussionComment: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-  const sourceParentId = apiData.sourceParentId
-
-  const member = parseMember(memberData)
-
-  const subType = apiData.subType
-
-  let activity: IActivityData
-
-  if (subType === GithubActivitySubType.DISCUSSION_COMMENT_START) {
-    activity = {
-      type: GithubActivityType.DISCUSSION_COMMENT,
-      sourceId: data.id,
-      sourceParentId: data.discussion.id,
-      timestamp: new Date(data.createdAt).toISOString(),
-      url: data.url,
-      body: data.bodyText,
-      channel: apiData.repo.url,
-      attributes: {
-        isAnswer: data.isAnswer ?? undefined,
-      },
-      member,
-      score: data.isAnswer
-        ? GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score + 2
-        : GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score,
-      isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].isContribution,
-    }
-  } else if (subType === GithubActivitySubType.DISCUSSION_COMMENT_REPLY) {
-    activity = {
-      type: GithubActivityType.DISCUSSION_COMMENT,
-      sourceId: data.id,
-      sourceParentId,
-      timestamp: new Date(data.createdAt).toISOString(),
-      url: data.url,
-      body: data.bodyText,
-      channel: apiData.repo.url,
-      member,
-      score: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score,
-      isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].isContribution,
-    }
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseAuthoredCommit: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-  const sourceParentId = apiData.sourceParentId // this is a pull request id
-
-  const activity: IActivityData = {
-    channel: apiData.repo.url,
-    url: `${apiData.repo.url}/commit/${data.commit.oid}`,
-    body: data.commit.message,
-    type: 'authored-commit',
-    sourceId: data.commit.oid,
-    sourceParentId: `${sourceParentId}`,
-    timestamp: new Date(data.commit.authoredDate).toISOString(),
-    attributes: {
-      insertions: 'additions' in data.commit ? data.commit.additions : 0,
-      deletions: 'deletions' in data.commit ? data.commit.deletions : 0,
-      lines:
-        'additions' in data.commit && 'deletions' in data.commit
-          ? data.commit.additions - data.commit.deletions
-          : 0,
-      isMerge: data.commit.parents.totalCount > 1,
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].score,
-    isContribution: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const parseWebhookIssue = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-
-  let type: GithubActivityType
-  let scoreGrid: IActivityScoringGrid
-  let timestamp: string
-  let sourceId: string
-  let sourceParentId: string
-  let body = ''
-  let title = ''
-
-  switch (payload.action) {
-    case 'edited':
-    case 'opened':
-    case 'reopened':
-      type = GithubActivityType.ISSUE_OPENED
-      scoreGrid = GITHUB_GRID[GithubActivityType.ISSUE_OPENED]
-      timestamp = payload.issue.created_at
-      sourceParentId = null
-      sourceId = payload.issue.node_id.toString()
-      body = payload.issue.body
-      title = payload.issue.title
-      break
-
-    case 'closed':
-      type = GithubActivityType.ISSUE_CLOSED
-      scoreGrid = GITHUB_GRID[GithubActivityType.ISSUE_CLOSED]
-      timestamp = payload.issue.closed_at
-      sourceParentId = payload.issue.node_id.toString()
-      sourceId = `gen-CE_${payload.issue.node_id.toString()}_${payload.sender.login}_${new Date(
-        payload.issue.closed_at,
-      ).toISOString()}`
-      break
-
-    default:
-      return
-  }
-
-  const issue = payload.issue
-
-  if (member) {
-    const activity: IActivityData = {
-      member,
-      type,
-      timestamp: new Date(timestamp).toISOString(),
-      sourceId,
-      sourceParentId,
-      url: issue.html_url,
-      title,
-      channel: payload.repository.html_url,
-      body,
-      attributes: {
-        state: issue.state,
-      },
-      score: scoreGrid.score,
-      isContribution: scoreGrid.isContribution,
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseWebhookDiscussion = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-  if (payload.action === 'answered') {
-    if (member) {
-      const answer = payload.answer
-      const activity: IActivityData = {
-        member,
-        type: GithubActivityType.DISCUSSION_COMMENT,
-        timestamp: new Date(answer.created_at).toISOString(),
-        sourceId: answer.node_id.toString(),
-        sourceParentId: payload.discussion.node_id.toString(),
-        attributes: {
-          isSelectedAnswer: true,
-        },
-        channel: payload.repository.html_url,
-        body: answer.body,
-        url: answer.html_url,
-        score: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score + 2,
-        isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].isContribution,
-      }
-
-      await ctx.publishActivity(activity)
-    }
-  }
-
-  if (!['edited', 'created'].includes(payload.action)) {
-    return
-  }
-
-  const discussion = payload.discussion
-
-  if (member) {
-    const activity: IActivityData = {
-      member,
-      type: GithubActivityType.DISCUSSION_STARTED,
-      timestamp: new Date(discussion.created_at).toISOString(),
-      sourceId: discussion.node_id.toString(),
-      sourceParentId: null,
-      url: discussion.html_url,
-      title: discussion.title,
-      channel: payload.repository.html_url,
-      body: discussion.body,
-      attributes: {
-        category: {
-          id: discussion.category.node_id,
-          isAnswerable: discussion.category.is_answerable,
-          name: discussion.category.name,
-          slug: discussion.category.slug,
-          emoji: discussion.category.emoji,
-          description: discussion.category.description,
-        },
-      },
-      score: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].score,
-      isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].isContribution,
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseWebhookPullRequest = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-  const objectMemberData = data.objectMember
-  const objectMember = objectMemberData ? parseMember(objectMemberData) : null
-
-  let type: GithubActivityType
-  let scoreGrid: IActivityScoringGrid
-  let timestamp: string
-  let sourceParentId: string
-  let sourceId: string
-  let body = ''
-  let title = ''
-
-  switch (payload.action) {
-    case 'edited':
-    case 'opened':
-    case 'reopened': {
-      type = GithubActivityType.PULL_REQUEST_OPENED
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED]
-      timestamp = payload.pull_request.created_at
-      sourceId = payload.pull_request.node_id.toString()
-      sourceParentId = null
-      body = payload.pull_request.body
-      title = payload.pull_request.title
-      break
-    }
-
-    case 'closed': {
-      type = GithubActivityType.PULL_REQUEST_CLOSED
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED]
-      timestamp = payload.pull_request.closed_at
-      sourceParentId = payload.pull_request.node_id.toString()
-      sourceId = `gen-CE_${payload.pull_request.node_id.toString()}_${
-        payload.sender.login
-      }_${new Date(payload.pull_request.closed_at).toISOString()}`
-      break
-    }
-
-    case 'assigned': {
-      type = GithubActivityType.PULL_REQUEST_ASSIGNED
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_ASSIGNED]
-      timestamp = payload.pull_request.updated_at
-      sourceParentId = payload.pull_request.node_id.toString()
-      sourceId = `gen-AE_${payload.pull_request.node_id.toString()}_${payload.sender.login}_${
-        payload.assignee.login
-      }_${new Date(payload.pull_request.updated_at).toISOString()}`
-      break
-    }
-
-    case 'review_requested': {
-      type = GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED]
-      timestamp = payload.pull_request.updated_at
-      sourceParentId = payload.pull_request.node_id.toString()
-      sourceId = `gen-RRE_${payload.pull_request.node_id.toString()}_${payload.sender.login}_${
-        payload.requested_reviewer.login
-      }_${new Date(payload.pull_request.updated_at).toISOString()}`
-      break
-    }
-
-    case 'merged': {
-      type = GithubActivityType.PULL_REQUEST_MERGED
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED]
-      timestamp = payload.pull_request.merged_at
-      sourceParentId = payload.pull_request.node_id.toString()
-      sourceId = `gen-ME_${payload.pull_request.node_id.toString()}_${
-        payload.pull_request.merged_by?.login || member.identities[0].value
-      }_${new Date(payload.pull_request.merged_at).toISOString()}`
-      break
-    }
-
-    default: {
-      return undefined
-    }
-  }
-
-  const pull = payload.pull_request
-
-  if (member) {
-    const activity: IActivityData = {
-      member,
-      objectMember,
-      type,
-      timestamp: new Date(timestamp).toISOString(),
-      sourceId,
-      sourceParentId,
-      url: pull.html_url,
-      title,
-      channel: payload.repository.html_url,
-      body,
-      score: scoreGrid.score,
-      isContribution: scoreGrid.isContribution,
-      attributes: {
-        state: pull.state,
-        additions: pull.additions,
-        deletions: pull.deletions,
-        changedFiles: pull.changed_files,
-        authorAssociation: pull.author_association,
-        labels: pull.labels.map((l) => l.name),
-      },
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseWebhookPullRequestReview = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-
-  let type: GithubActivityType
-  let scoreGrid: IActivityScoringGrid
-  let timestamp: string
-  let sourceParentId: string
-  let sourceId: string
-  let body = ''
-
-  switch (payload.action) {
-    case 'submitted': {
-      // additional comments to existing review threads also result in submitted events
-      // since these will be handled in pull_request_review_comment.created events
-      // we're ignoring when state is commented and it has no body.
-      if (payload.review.state === 'commented' && payload.review.body === null) {
-        return undefined
-      }
-
-      type = GithubActivityType.PULL_REQUEST_REVIEWED
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED]
-      timestamp = payload.review.submitted_at
-      sourceParentId = payload.pull_request.node_id.toString()
-      sourceId = `gen-PRR_${payload.pull_request.node_id.toString()}_${
-        payload.sender.login
-      }_${new Date(payload.review.submitted_at).toISOString()}`
-      body = payload.review.body
-      break
-    }
-    default: {
-      return undefined
-    }
-  }
-
-  const pull = payload.pull_request
-
-  if (member) {
-    const activity: IActivityData = {
-      member,
-      type,
-      timestamp: new Date(timestamp).toISOString(),
-      sourceId,
-      sourceParentId,
-      url: pull.html_url,
-      title: '',
-      channel: payload.repository.html_url,
-      body,
-      score: scoreGrid.score,
-      isContribution: scoreGrid.isContribution,
-      attributes: {
-        reviewState: (payload.review?.state as string).toUpperCase(),
-        state: pull.state,
-        authorAssociation: pull.author_association,
-        labels: pull.labels.map((l) => l.name),
-      },
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseWebhookStar = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-
-  let type: GithubActivityType
-  switch (payload.action) {
-    case 'created': {
-      type = GithubActivityType.STAR
-      break
-    }
-
-    case 'deleted': {
-      type = GithubActivityType.UNSTAR
-      break
-    }
-
-    default: {
-      return
-    }
-  }
-
-  if (
-    member &&
-    (type === GithubActivityType.UNSTAR ||
-      (type === GithubActivityType.STAR && payload.starred_at !== null))
-  ) {
-    const starredAt =
-      type === GithubActivityType.STAR ? new Date(payload.starred_at).toISOString() : data.date
-
-    const activity: IActivityData = {
-      member,
-      type,
-      timestamp: starredAt,
-      sourceId: generateSourceIdHash(
-        payload.sender.login,
-        type,
-        Math.floor(new Date(starredAt).getTime() / 1000).toString(),
-        PlatformType.GITHUB,
-      ),
-      sourceParentId: null,
-      channel: payload.repository.html_url,
-      score:
-        type === 'star'
-          ? GITHUB_GRID[GithubActivityType.STAR].score
-          : GITHUB_GRID[GithubActivityType.UNSTAR].score,
-      isContribution:
-        type === 'star'
-          ? GITHUB_GRID[GithubActivityType.STAR].isContribution
-          : GITHUB_GRID[GithubActivityType.UNSTAR].isContribution,
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseWebhookFork = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-
-  // this is org member
-  if (data.orgMember && !data.member) {
-    const orgMember = parseOrgMember(data.orgMember)
-    if (orgMember) {
-      const activity: IActivityData = {
-        member: orgMember,
-        type: GithubActivityType.FORK,
-        timestamp: new Date(payload.forkee.created_at).toISOString(),
-        sourceId: payload.forkee.node_id.toString(),
-        sourceParentId: null,
-        channel: payload.repository.html_url,
-        score: GITHUB_GRID.fork.score,
-        isContribution: GITHUB_GRID.fork.isContribution,
-      }
-
-      await ctx.publishActivity(activity)
-    }
-    // this is member
-  } else if (data.member && !data.orgMember) {
-    const member = parseMember(data.member)
-    if (member) {
-      const activity: IActivityData = {
-        member,
-        type: GithubActivityType.FORK,
-        timestamp: new Date(payload.forkee.created_at).toISOString(),
-        sourceId: payload.forkee.node_id.toString(),
-        sourceParentId: null,
-        channel: payload.repository.html_url,
-        score: GITHUB_GRID.fork.score,
-        isContribution: GITHUB_GRID.fork.isContribution,
-      }
-
-      await ctx.publishActivity(activity)
-    } else if (data.member && data.orgMember) {
-      throw new Error('Both member and orgMember are present in webhook fork data')
-    } else if (!data.member && !data.orgMember) {
-      throw new Error('Both member and orgMember are missing in webhook fork data')
-    }
-  }
-}
-
-const parseWebhookComment = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-  let type: GithubActivityType
-  let sourceParentId: string | undefined
-
-  switch (data.webhookType) {
-    case GithubWehookEvent.DISCUSSION_COMMENT: {
-      switch (payload.action) {
-        case 'created':
-        case 'edited':
-          type = GithubActivityType.DISCUSSION_COMMENT
-          sourceParentId = payload.discussion.node_id.toString()
-          break
-        default:
-          return undefined
-      }
-      break
-    }
-
-    case GithubWehookEvent.ISSUE_COMMENT:
-    case GithubWehookEvent.PULL_REQUEST_COMMENT: {
-      switch (payload.action) {
-        case 'created':
-        case 'edited': {
-          if ('pull_request' in payload.issue) {
-            type = GithubActivityType.PULL_REQUEST_COMMENT
-          } else {
-            type = GithubActivityType.ISSUE_COMMENT
-          }
-          sourceParentId = payload.issue.node_id.toString()
-          break
-        }
-
-        default:
-          return
-      }
-      break
-    }
-
-    default: {
-      return
-    }
-  }
-
-  if (member) {
-    const comment = payload.comment
-    const activity: IActivityData = {
-      member,
-      type,
-      timestamp: new Date(comment.created_at).toISOString(),
-      sourceId: comment.node_id.toString(),
-      sourceParentId,
-      url: comment.html_url,
-      body: comment.body,
-      channel: payload.repository.html_url,
-      score: GITHUB_GRID[type].score,
-      isContribution: GITHUB_GRID[type].isContribution,
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseWebhookPullRequestReviewThreadComment = async (ctx: IProcessDataContext) => {
-  const data = ctx.data as GithubWebhookData
-  const payload = data.data
-  const memberData = data.member
-
-  const member = parseMember(memberData)
-
-  let type: GithubActivityType
-  let scoreGrid: IActivityScoringGrid
-  let timestamp: string
-  let sourceParentId: string
-  let sourceId: string
-  let body = ''
-
-  switch (payload.action) {
-    case 'created': {
-      type = GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT
-      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT]
-      timestamp = payload.comment.created_at
-      sourceParentId = payload.pull_request.node_id
-      sourceId = payload.comment.node_id
-      body = payload.comment.body
-      break
-    }
-    default: {
-      return undefined
-    }
-  }
-
-  if (member) {
-    const activity: IActivityData = {
-      member,
-      type,
-      timestamp: new Date(timestamp).toISOString(),
-      sourceId,
-      sourceParentId,
-      url: payload.comment.html_url,
-      title: '',
-      channel: payload.repository.html_url,
-      body,
-      score: scoreGrid.score,
-      isContribution: scoreGrid.isContribution,
-      attributes: {
-        state: payload.pull_request.state,
-        authorAssociation: payload.pull_request.author_association,
-        labels: payload.pull_request.labels.map((l) => l.name),
-      },
-    }
-
-    await ctx.publishActivity(activity)
-  }
-}
-
-const parseDiscussionStarted: ProcessDataHandler = async (ctx) => {
-  const apiData = ctx.data as GithubApiData
-  const data = apiData.data
-  const memberData = apiData.member
-
-  const member = parseMember(memberData)
-
-  const activity: IActivityData = {
-    type: GithubActivityType.DISCUSSION_STARTED,
-    sourceId: data.id,
-    sourceParentId: '',
-    timestamp: new Date(data.createdAt).toISOString(),
-    body: data.bodyText,
-    url: data.url ? data.url : '',
-    channel: apiData.repo.url,
-    title: data.title,
-    attributes: {
-      category: {
-        id: data.category.id,
-        isAnswerable: data.category.isAnswerable,
-        name: data.category.name,
-        slug: data.category.slug,
-        emoji: data.category.emoji,
-        description: data.category.description,
-      },
-    },
-    member,
-    score: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].score,
-    isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].isContribution,
-  }
-
-  await ctx.publishActivity(activity)
-}
-
-const handler: ProcessDataHandler = async (ctx) => {
-  const data = ctx.data as any
-
-  const event = data?.type as GithubActivityType
-  const webhookEvent = data?.webhookType as GithubWehookEvent
-
-  if (event) {
-    // parse github api data
-    switch (event) {
-      case GithubActivityType.STAR:
-        await parseStar(ctx)
-        break
-      case GithubActivityType.FORK:
-        await parseFork(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_OPENED:
-        await parsePullRequestOpened(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_CLOSED:
-        await parsePullRequestClosed(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED:
-        await parsePullRequestReviewRequested(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_REVIEWED:
-        await parsePullRequestReviewed(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_ASSIGNED:
-        await parsePullRequestAssigned(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_MERGED:
-        await parsePullRequestMerged(ctx)
-        break
-      case GithubActivityType.ISSUE_OPENED:
-        await parseIssueOpened(ctx)
-        break
-      case GithubActivityType.ISSUE_CLOSED:
-        await parseIssueClosed(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_COMMENT:
-        await parsePullRequestComment(ctx)
-        break
-      case GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT:
-        await parsePullRequestReviewThreadComment(ctx)
-        break
-      case GithubActivityType.ISSUE_COMMENT:
-        await parseIssueComment(ctx)
-        break
-      case GithubActivityType.DISCUSSION_STARTED:
-        await parseDiscussionStarted(ctx)
-        break
-      case GithubActivityType.DISCUSSION_COMMENT:
-        await parseDiscussionComment(ctx)
-        break
-      case GithubActivityType.AUTHORED_COMMIT:
-        await parseAuthoredCommit(ctx)
-        break
-      default:
-        await ctx.abortWithError(`Event not supported '${event}'!`)
-    }
-  } else if (webhookEvent) {
-    // TODO: implement webhook events
-    switch (webhookEvent) {
-      case GithubWehookEvent.ISSUES:
-        await parseWebhookIssue(ctx)
-        break
-      case GithubWehookEvent.DISCUSSION:
-        await parseWebhookDiscussion(ctx)
-        break
-      case GithubWehookEvent.PULL_REQUEST:
-        await parseWebhookPullRequest(ctx)
-        break
-      case GithubWehookEvent.PULL_REQUEST_REVIEW:
-        await parseWebhookPullRequestReview(ctx)
-        break
-      case GithubWehookEvent.STAR:
-        await parseWebhookStar(ctx)
-        break
-      case GithubWehookEvent.FORK:
-        await parseWebhookFork(ctx)
-        break
-      case GithubWehookEvent.DISCUSSION_COMMENT:
-      case GithubWehookEvent.ISSUE_COMMENT:
-      case GithubWehookEvent.PULL_REQUEST_COMMENT:
-        await parseWebhookComment(ctx)
-        break
-      case GithubWehookEvent.PULL_REQUEST_REVIEW_COMMENT:
-        await parseWebhookPullRequestReviewThreadComment(ctx)
-        break
-      default:
-        await ctx.abortWithError(`Webhook event not supported '${webhookEvent}'!`)
-    }
-  }
-}
-
-export default handler
diff --git a/services/libs/integrations/src/integrations/github-old/processStream.ts b/services/libs/integrations/src/integrations/github-old/processStream.ts
deleted file mode 100644
index 0ec8f0c7b7..0000000000
--- a/services/libs/integrations/src/integrations/github-old/processStream.ts
+++ /dev/null
@@ -1,1298 +0,0 @@
-/* eslint-disable  @typescript-eslint/no-explicit-any */
-// processStream.ts content
-import { createAppAuth } from '@octokit/auth-app'
-import { AuthInterface } from '@octokit/auth-app/dist-types/types'
-
-import { singleOrDefault, timeout } from '@crowd/common'
-import { GraphQlQueryResponse, IConcurrentRequestLimiter } from '@crowd/types'
-
-import {
-  IProcessStreamContext,
-  IProcessWebhookStreamContext,
-  ProcessStreamHandler,
-} from '../../types'
-
-import DiscussionCommentsQuery from './api/graphql/discussionComments'
-import DiscussionsQuery from './api/graphql/discussions'
-import ForksQuery from './api/graphql/forks'
-import IssueCommentsQuery from './api/graphql/issueComments'
-import IssuesQuery from './api/graphql/issues'
-import getMember from './api/graphql/members'
-import getOrganization from './api/graphql/organizations'
-import PullRequestCommentsQuery from './api/graphql/pullRequestComments'
-import PullRequestCommitsQuery, { PullRequestCommit } from './api/graphql/pullRequestCommits'
-import PullRequestCommitsQueryNoAdditions, {
-  PullRequestCommitNoAdditions,
-} from './api/graphql/pullRequestCommitsNoAdditions'
-import PullRequestReviewThreadCommentsQuery from './api/graphql/pullRequestReviewThreadComments'
-import PullRequestReviewThreadsQuery from './api/graphql/pullRequestReviewThreads'
-import PullRequestsQuery from './api/graphql/pullRequests'
-import StargazersQuery from './api/graphql/stargazers'
-import { GithubTokenRotator } from './tokenRotator'
-import {
-  GithubActivitySubType,
-  GithubActivityType,
-  GithubApiData,
-  GithubBasicStream,
-  GithubBotMember,
-  GithubIntegrationSettings,
-  GithubPlatformSettings,
-  GithubPrepareMemberOutput,
-  GithubPrepareOrgMemberOutput,
-  GithubPullRequestEvents,
-  GithubRootStream,
-  GithubStreamType,
-  INDIRECT_FORK,
-  Repo,
-  Repos,
-} from './types'
-
-const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
-
-const containsHrefAttribute = (htmlSnippet: string) => {
-  // Constructing the regex using RegExp
-  const hrefRegex = new RegExp('href\\s*=\\s*["\'][^"\']*["\']', 'i')
-  return hrefRegex.test(htmlSnippet)
-}
-
-let githubAuthenticator: AuthInterface | undefined = undefined
-let concurrentRequestLimiter: IConcurrentRequestLimiter | undefined = undefined
-let tokenRotator: GithubTokenRotator | undefined = undefined
-
-function getAuth(ctx: IProcessStreamContext): AuthInterface | undefined {
-  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
-  const privateKey = GITHUB_CONFIG.privateKey
-    ? Buffer.from(GITHUB_CONFIG.privateKey, 'base64').toString('ascii')
-    : undefined
-
-  if (githubAuthenticator === undefined) {
-    githubAuthenticator = privateKey
-      ? createAppAuth({
-          appId: GITHUB_CONFIG.appId,
-          clientId: GITHUB_CONFIG.clientId,
-          clientSecret: GITHUB_CONFIG.clientSecret,
-          privateKey,
-        })
-      : undefined
-  }
-  return githubAuthenticator
-}
-
-export function getConcurrentRequestLimiter(
-  ctx: IProcessStreamContext | IProcessWebhookStreamContext,
-): IConcurrentRequestLimiter {
-  if (concurrentRequestLimiter === undefined) {
-    concurrentRequestLimiter = ctx.getConcurrentRequestLimiter(
-      50, // max 2 concurrent requests
-      'github-concurrent-request-limiter',
-    )
-  }
-  return concurrentRequestLimiter
-}
-
-export function getTokenRotator(ctx: IProcessStreamContext): GithubTokenRotator {
-  const GITHUB_CONFIG = ctx?.platformSettings as GithubPlatformSettings
-
-  // check if we have tokens configured
-  if (!GITHUB_CONFIG?.personalAccessTokens) {
-    // if tokenRotator is undefined, API requests won't use it
-    return undefined
-  }
-
-  if (tokenRotator === undefined) {
-    tokenRotator = new GithubTokenRotator(
-      ctx.globalCache,
-      GITHUB_CONFIG?.personalAccessTokens?.split(','),
-    )
-  }
-  return tokenRotator
-}
-
-export async function getGithubToken(ctx: IProcessStreamContext): Promise<string> {
-  const auth = getAuth(ctx)
-  if (auth) {
-    const authResponse = await auth({
-      type: 'installation',
-      installationId: ctx.integration.identifier,
-    })
-    const token = authResponse.token
-    // this is a real token, not a JWT token
-    // OctoKit automatically caches it for 1 hour and renews it when needed
-    return token
-  }
-
-  throw new Error('GitHub integration is not configured!')
-}
-
-async function getMemberData(ctx: IProcessStreamContext, login: string): Promise<any> {
-  const appToken = await getGithubToken(ctx)
-  return getMember(login, appToken, getTokenRotator(ctx), {
-    concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-    integrationId: ctx.integration.id,
-  })
-}
-
-async function getOrganizationData(ctx: IProcessStreamContext, company: string): Promise<any> {
-  if (company === '' || company === null || company === undefined) {
-    return null
-  }
-
-  const cache = ctx.globalCache
-  const prefix = (x: string) => `github-org:${x}`
-
-  const existing = await cache.get(prefix(company))
-  if (existing) {
-    if (existing === 'null') {
-      return null
-    }
-
-    return JSON.parse(existing)
-  }
-
-  const token = await getGithubToken(ctx)
-  const fromAPI = await getOrganization(company, token, getTokenRotator(ctx), {
-    concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-    integrationId: ctx.integration.id,
-  })
-
-  if (fromAPI) {
-    await cache.set(prefix(company), JSON.stringify(fromAPI), 24 * 60 * 60)
-    return fromAPI
-  }
-
-  await cache.set(prefix(company), 'null', 24 * 60 * 60)
-  return null
-}
-
-async function getMemberEmail(ctx: IProcessStreamContext, login: string): Promise<string> {
-  if (IS_TEST_ENV) {
-    return ''
-  }
-
-  // here we use global cache - it is shared between all integrations
-  // So in LFX case different integration will have access to the same cache
-  // But this is fine
-  const cache = ctx.globalCache
-  const prefix = (x: string) => `github-login:${x}`
-
-  const existing = await cache.get(prefix(login))
-  if (existing) {
-    if (existing === 'null') {
-      return ''
-    }
-
-    return existing
-  }
-
-  const member = await getMemberData(ctx, login)
-  const email = (member && member.email ? member.email : '').trim()
-  if (email && email.length > 0) {
-    await cache.set(prefix(login), email, 24 * 60 * 60)
-    return email
-  }
-
-  await cache.set(prefix(login), 'null', 24 * 60 * 60)
-  return ''
-}
-
-const publishNextPageStream = async (
-  ctx: IProcessStreamContext,
-  response: GraphQlQueryResponse,
-) => {
-  const data = ctx.stream.data as GithubBasicStream
-  // the last part of stream identifier is page number (e.g commits:12345:1)
-  const streamIdentifier = ctx.stream.identifier.split(':').slice(0, -1).join(':')
-  if (response.hasPreviousPage) {
-    await ctx.publishStream<GithubBasicStream>(`${streamIdentifier}:${response.startCursor}`, {
-      repo: data.repo,
-      page: response.startCursor,
-    })
-  }
-}
-
-// this function extracts email and orgs from member data
-export const prepareMember = async (
-  memberFromApi: any,
-  ctx: IProcessStreamContext,
-): Promise<GithubPrepareMemberOutput> => {
-  const email = await getMemberEmail(ctx, memberFromApi.login)
-
-  let orgs: any
-
-  if (memberFromApi?.company) {
-    if (IS_TEST_ENV) {
-      orgs = [{ name: 'crowd.dev' }]
-    } else {
-      const companyHTML = memberFromApi?.companyHTML
-      // if company is matched againts github org it's html will contain href attribute
-      if (companyHTML && containsHrefAttribute(companyHTML)) {
-        const company = memberFromApi.company.replace('@', '').trim()
-        const fromAPI = await getOrganizationData(ctx, company)
-        orgs = fromAPI
-      } else {
-        orgs = null
-      }
-    }
-  }
-
-  return {
-    email,
-    orgs,
-    memberFromApi,
-  }
-}
-
-export const prepareBotMember = (bot: GithubBotMember): GithubPrepareMemberOutput => {
-  return {
-    email: '',
-    orgs: [],
-    memberFromApi: {
-      login: bot.login,
-      avatarUrl: bot?.avatarUrl || bot?.avatar_url || '',
-      url: bot.url,
-      id: bot.id,
-      isBot: true,
-    },
-  }
-}
-
-export const prepareDeletedMember = (): GithubPrepareMemberOutput => {
-  return {
-    email: '',
-    orgs: [],
-    memberFromApi: {
-      login: 'ghost',
-      avatarUrl: 'https://avatars.githubusercontent.com/u/10137?v=4',
-      url: 'https://github.com/ghost',
-      isDeleted: true,
-    },
-  }
-}
-
-export const prepareMemberFromOrg = (orgFromApi: any): GithubPrepareOrgMemberOutput => {
-  return {
-    orgFromApi,
-  }
-}
-
-/**
- * Searches given repository name among installed repositories
- * Returns null if given repo is not found.
- * @param name  The tenant we are working on
- * @param context
- * @returns Found repo object
- */
-function getRepoByName(name: string, ctx: IProcessStreamContext): Repo | null {
-  const settings = ctx.integration.settings as GithubIntegrationSettings
-  const availableRepo: Repo | undefined = singleOrDefault(settings.repos, (r) => r.name === name)
-  if (availableRepo) {
-    return { ...availableRepo, available: true }
-  }
-
-  const unavailableRepo: Repo | undefined = singleOrDefault(
-    settings.unavailableRepos,
-    (r) => r.name === name,
-  )
-  if (unavailableRepo) {
-    return { ...unavailableRepo, available: false }
-  }
-
-  return null
-}
-
-const processRootStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubRootStream
-  const repos: Repos = []
-  const unavailableRepos: Repos = []
-
-  for (const repo of data.reposToCheck) {
-    try {
-      // we don't need to get default 100 item per page, just 1 is enough to check if repo is available
-      const stargazersQuery = new StargazersQuery(repo, await getGithubToken(ctx), 1)
-      await stargazersQuery.getSinglePage(
-        '',
-        {
-          concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-          integrationId: ctx.integration.id,
-        },
-        getTokenRotator(ctx),
-      )
-      repos.push(repo)
-    } catch (e) {
-      if (e.rateLimitResetSeconds) {
-        throw e
-      } else {
-        ctx.log.warn(
-          `Repo ${repo.name} will not be parsed. It is not available with the github token`,
-        )
-        unavailableRepos.push(repo)
-      }
-    }
-  }
-
-  // update integration settings
-  // this settings will be avaliable in next streams
-  await ctx.updateIntegrationSettings({
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ...(ctx.integration.settings as any),
-    repos,
-    unavailableRepos,
-  })
-
-  // now it's time to start streams
-  for (const repo of repos) {
-    for (const endpoint of [
-      GithubStreamType.STARGAZERS,
-      GithubStreamType.FORKS,
-      GithubStreamType.PULLS,
-      GithubStreamType.ISSUES,
-      GithubStreamType.DISCUSSIONS,
-    ]) {
-      // this firstPage thing is important to avoid duplicate streams and for handleNextPageStream to work
-      await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
-        repo,
-        page: '',
-      })
-    }
-  }
-}
-
-const processStargazersStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const stargazersQuery = new StargazersQuery(data.repo, await getGithubToken(ctx))
-
-  const result = await stargazersQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  for (const record of result.data) {
-    if (record.node === null) {
-      throw new Error(
-        'Stargazer is not found. This might be a deleted user. Please check the data.',
-      )
-    }
-
-    const member = await prepareMember(record.node, ctx)
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.STAR,
-      data: record,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-  }
-}
-
-const processForksStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const forksQuery = new ForksQuery(data.repo, await getGithubToken(ctx))
-  const result = await forksQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  for (const record of result.data) {
-    if (record.owner === null) {
-      throw new Error('Fork owner is not found. This might be a deleted user.')
-    }
-    if (record.owner.__typename === 'User') {
-      const member = await prepareMember(record.owner, ctx)
-
-      // publish data
-      await ctx.processData<GithubApiData>({
-        type: GithubActivityType.FORK,
-        data: record,
-        member,
-        repo: data.repo,
-        isOld: true,
-      })
-    } else if (record.owner.__typename === 'Organization') {
-      const orgMember = prepareMemberFromOrg(record.owner)
-
-      // publish data
-      await ctx.processData<GithubApiData>({
-        type: GithubActivityType.FORK,
-        data: record,
-        orgMember,
-        repo: data.repo,
-        isOld: true,
-      })
-    } else {
-      ctx.log.warn(`Unsupported owner type: ${record.owner.__typename}`)
-    }
-
-    // traverse through indirect forks
-    for (const indirectFork of record.indirectForks.nodes) {
-      if (indirectFork.owner === null) {
-        throw new Error('Fork owner is not found. This might be a deleted user.')
-      }
-      if (indirectFork.owner.__typename === 'User') {
-        const member = await prepareMember(indirectFork.owner, ctx)
-
-        // publish data
-        await ctx.processData<GithubApiData>({
-          type: GithubActivityType.FORK,
-          subType: INDIRECT_FORK,
-          data: indirectFork,
-          relatedData: record,
-          member,
-          repo: data.repo,
-          isOld: true,
-        })
-      } else if (indirectFork.owner.__typename === 'Organization') {
-        const orgMember = prepareMemberFromOrg(indirectFork.owner)
-
-        // publish data
-        await ctx.processData<GithubApiData>({
-          type: GithubActivityType.FORK,
-          subType: INDIRECT_FORK,
-          data: indirectFork,
-          relatedData: record,
-          orgMember,
-          repo: data.repo,
-          isOld: true,
-        })
-      } else {
-        ctx.log.warn(`Unsupported owner type: ${indirectFork.owner.__typename}`)
-      }
-    }
-  }
-}
-
-const processPullsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const forksQuery = new PullRequestsQuery(data.repo, await getGithubToken(ctx))
-  const result = await forksQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  for (const pull of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (pull.author?.login) {
-      member = await prepareMember(pull.author, ctx)
-    } else if (pull.authorBot?.login) {
-      member = prepareBotMember(pull.authorBot)
-    } else if (pull.author === null && pull.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn('Pull request author is not found. This pull request will not be parsed.')
-      continue
-    }
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.PULL_REQUEST_OPENED,
-      data: pull,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-
-    // now we need to parse pullRequestEvents
-    for (const pullEvent of pull.timelineItems.nodes) {
-      switch (pullEvent.__typename) {
-        case GithubPullRequestEvents.ASSIGN: {
-          let member: GithubPrepareMemberOutput
-          let objectMember: GithubPrepareMemberOutput
-
-          if (pullEvent?.actor?.login) {
-            member = await prepareMember(pullEvent.actor, ctx)
-          } else if (pullEvent?.actorBot?.login) {
-            member = prepareBotMember(pullEvent.actorBot)
-          } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
-            member = prepareDeletedMember()
-          } else {
-            ctx.log.warn(
-              'Pull request author is not found. This pull request event will not be parsed.',
-            )
-            continue
-          }
-
-          if (pullEvent?.assignee?.login) {
-            objectMember = await prepareMember(pullEvent.assignee, ctx)
-          } else if (pullEvent?.assigneeBot?.login) {
-            objectMember = prepareBotMember(pullEvent.assigneeBot)
-          } else if (pullEvent.assignee === null && pullEvent.assigneeBot === null) {
-            objectMember = prepareDeletedMember()
-          } else {
-            ctx.log.warn(
-              'Pull request assignee is not found. This pull request assignee event will not be parsed.',
-            )
-            continue
-          }
-
-          await ctx.processData<GithubApiData>({
-            type: GithubActivityType.PULL_REQUEST_ASSIGNED,
-            data: pullEvent,
-            relatedData: pull,
-            member,
-            objectMember,
-            repo: data.repo,
-            isOld: true,
-          })
-
-          break
-        }
-        case GithubPullRequestEvents.REQUEST_REVIEW: {
-          // Requested review from single member
-          if (pullEvent?.requestedReviewer?.login || pullEvent?.requestedReviewerBot?.login) {
-            let member: GithubPrepareMemberOutput
-            let objectMember: GithubPrepareMemberOutput
-
-            if (pullEvent?.actor?.login) {
-              member = await prepareMember(pullEvent.actor, ctx)
-            } else if (pullEvent?.actorBot?.login) {
-              member = prepareBotMember(pullEvent.actorBot)
-            } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
-              member = prepareDeletedMember()
-            } else {
-              ctx.log.warn(
-                'Pull request author is not found. This pull request event will not be parsed.',
-              )
-              continue
-            }
-
-            if (pullEvent?.requestedReviewer?.login) {
-              objectMember = await prepareMember(pullEvent.requestedReviewer, ctx)
-            } else if (pullEvent?.requestedReviewerBot?.login) {
-              objectMember = prepareBotMember(pullEvent.requestedReviewerBot)
-            } else if (
-              pullEvent.requestedReviewer === null &&
-              pullEvent.requestedReviewerBot === null
-            ) {
-              objectMember = prepareDeletedMember()
-            } else {
-              ctx.log.warn(
-                'Pull request requested reviewer is not found. This pull request requested reviewer event will not be parsed.',
-              )
-              continue
-            }
-            await ctx.processData<GithubApiData>({
-              type: GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED,
-              data: pullEvent,
-              subType: GithubActivitySubType.PULL_REQUEST_REVIEW_REQUESTED_SINGLE,
-              relatedData: pull,
-              member,
-              objectMember,
-              repo: data.repo,
-              isOld: true,
-            })
-            // Requested review from multiple members
-          } else if (pullEvent?.requestedReviewer?.members) {
-            let member: GithubPrepareMemberOutput
-            if (pullEvent?.actor?.login) {
-              member = await prepareMember(pullEvent.actor, ctx)
-            } else if (pullEvent?.actorBot?.login) {
-              member = prepareBotMember(pullEvent.actorBot)
-            } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
-              member = prepareDeletedMember()
-            } else {
-              ctx.log.warn(
-                'Pull request author is not found. This pull request event will not be parsed.',
-              )
-              continue
-            }
-
-            for (const teamMember of pullEvent.requestedReviewer.members.nodes) {
-              const objectMember = await prepareMember(teamMember, ctx)
-              await ctx.processData<GithubApiData>({
-                type: GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED,
-                data: pullEvent,
-                subType: GithubActivitySubType.PULL_REQUEST_REVIEW_REQUESTED_MULTIPLE,
-                relatedData: pull,
-                member,
-                objectMember,
-                repo: data.repo,
-                isOld: true,
-              })
-            }
-          }
-
-          break
-        }
-        case GithubPullRequestEvents.REVIEW: {
-          if ((pullEvent?.author?.login || pullEvent?.authorBot?.login) && pullEvent?.submittedAt) {
-            let member: GithubPrepareMemberOutput
-            if (pullEvent?.author?.login) {
-              member = await prepareMember(pullEvent.author, ctx)
-            } else if (pullEvent?.authorBot?.login) {
-              member = prepareBotMember(pullEvent.authorBot)
-            } else if (pullEvent.author === null && pullEvent.authorBot === null) {
-              member = prepareDeletedMember()
-            } else {
-              ctx.log.warn(
-                'Pull request author is not found. This pull request event will not be parsed.',
-              )
-              continue
-            }
-
-            await ctx.processData<GithubApiData>({
-              type: GithubActivityType.PULL_REQUEST_REVIEWED,
-              data: pullEvent,
-              relatedData: pull,
-              member,
-              repo: data.repo,
-              isOld: true,
-            })
-          }
-          break
-        }
-        case GithubPullRequestEvents.MERGE: {
-          let member: GithubPrepareMemberOutput
-          if (pullEvent?.actor?.login) {
-            member = await prepareMember(pullEvent.actor, ctx)
-          } else if (pullEvent?.actorBot?.login) {
-            member = prepareBotMember(pullEvent.actorBot)
-          } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
-            member = prepareDeletedMember()
-          } else {
-            ctx.log.warn(
-              'Pull request author is not found. This pull request event will not be parsed.',
-            )
-            continue
-          }
-
-          await ctx.processData<GithubApiData>({
-            type: GithubActivityType.PULL_REQUEST_MERGED,
-            data: pullEvent,
-            relatedData: pull,
-            member,
-            repo: data.repo,
-            isOld: true,
-          })
-
-          break
-        }
-        case GithubPullRequestEvents.CLOSE: {
-          let member: GithubPrepareMemberOutput
-          if (pullEvent?.actor?.login) {
-            member = await prepareMember(pullEvent.actor, ctx)
-          } else if (pullEvent?.actorBot?.login) {
-            member = prepareBotMember(pullEvent.actorBot)
-          } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
-            member = prepareDeletedMember()
-          } else {
-            ctx.log.warn(
-              'Pull request author is not found. This pull request event will not be parsed.',
-            )
-            continue
-          }
-
-          await ctx.processData<GithubApiData>({
-            type: GithubActivityType.PULL_REQUEST_MERGED,
-            data: pullEvent,
-            relatedData: pull,
-            member,
-            repo: data.repo,
-            isOld: true,
-          })
-
-          break
-        }
-        default:
-          ctx.log.warn(
-            `Unsupported pull request event:  ${pullEvent.__typename}. This event will not be parsed.`,
-          )
-      }
-    }
-  }
-
-  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
-  const IS_GITHUB_COMMIT_DATA_ENABLED = GITHUB_CONFIG.isCommitDataEnabled === 'true'
-
-  if (IS_GITHUB_COMMIT_DATA_ENABLED) {
-    // publish new pull commits streams
-    // It is very important to keep commits first. Otherwise, we have problems
-    // creating conversations if the Git integration has already ran for those data points.
-    for (const pull of result.data) {
-      await ctx.publishStream<GithubBasicStream>(
-        `${GithubStreamType.PULL_COMMITS}:${pull.number}:firstPage`,
-        {
-          repo: data.repo,
-          page: '',
-          prNumber: pull.number,
-        },
-      )
-    }
-  }
-
-  // publish new pull comments streams
-  for (const pull of result.data) {
-    await ctx.publishStream<GithubBasicStream>(
-      `${GithubStreamType.PULL_COMMENTS}:${pull.number}:firstPage`,
-      {
-        repo: data.repo,
-        page: '',
-        prNumber: pull.number,
-      },
-    )
-  }
-
-  // publish new pull review threads streams
-  for (const pull of result.data) {
-    await ctx.publishStream<GithubBasicStream>(
-      `${GithubStreamType.PULL_REVIEW_THREADS}:${pull.number}:firstPage`,
-      {
-        repo: data.repo,
-        page: '',
-        prNumber: pull.number,
-      },
-    )
-  }
-}
-
-const processPullCommentsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const pullRequestNumber = data.prNumber
-  const pullRequestCommentsQuery = new PullRequestCommentsQuery(
-    data.repo,
-    pullRequestNumber,
-    await getGithubToken(ctx),
-  )
-
-  const result = await pullRequestCommentsQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  // get member info for each comment
-  for (const record of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (record.author?.login) {
-      member = await prepareMember(record.author, ctx)
-    } else if (record.authorBot?.login) {
-      member = prepareBotMember(record.authorBot)
-    } else if (record.author === null && record.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn(
-        'Pull request comment author is not found. This pull request comment will not be parsed.',
-      )
-      continue
-    }
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.PULL_REQUEST_COMMENT,
-      data: record,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-  }
-}
-
-const processPullReviewThreadsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const pullRequestNumber = data.prNumber
-  const pullRequestReviewThreadsQuery = new PullRequestReviewThreadsQuery(
-    data.repo,
-    pullRequestNumber,
-    await getGithubToken(ctx),
-  )
-
-  const result = await pullRequestReviewThreadsQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  // no data to publish, just add new streams for comments inside
-  // add each review thread as separate stream for comments inside
-  for (const thread of result.data) {
-    await ctx.publishStream<GithubBasicStream>(
-      `${GithubStreamType.PULL_REVIEW_THREAD_COMMENTS}:${thread.id}:firstPage`,
-      {
-        repo: data.repo,
-        page: '',
-        reviewThreadId: thread.id,
-      },
-    )
-  }
-}
-
-const processPullReviewThreadCommentsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const reviewThreadId = data.reviewThreadId
-  const pullRequestReviewThreadCommentsQuery = new PullRequestReviewThreadCommentsQuery(
-    data.repo,
-    reviewThreadId,
-    await getGithubToken(ctx),
-  )
-
-  const result = await pullRequestReviewThreadCommentsQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  // get additional member info for each comment
-  for (const record of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (record.author?.login) {
-      member = await prepareMember(record.author, ctx)
-    } else if (record.authorBot?.login) {
-      member = prepareBotMember(record.authorBot)
-    } else if (record.author === null && record.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn(
-        'Pull request review thread comment author is not found. This pull request review thread comment will not be parsed.',
-      )
-      continue
-    }
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT,
-      data: record,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-  }
-}
-
-export const processPullCommitsStream: ProcessStreamHandler = async (ctx) => {
-  let result: GraphQlQueryResponse
-
-  const data = ctx.stream.data as GithubBasicStream
-  const pullRequestNumber = data.prNumber
-
-  const token = await getGithubToken(ctx)
-
-  const pullRequestCommitsQuery = new PullRequestCommitsQuery(data.repo, pullRequestNumber, token)
-
-  try {
-    result = await pullRequestCommitsQuery.getSinglePage(
-      data.page,
-      {
-        concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-        integrationId: ctx.integration.id,
-      },
-      getTokenRotator(ctx),
-    )
-  } catch (err) {
-    ctx.log.warn(
-      {
-        err,
-        repo: data.repo,
-        pullRequestNumber,
-      },
-      'Error while fetching pull request commits. Trying again without additions.',
-    )
-    const pullRequestCommitsQueryNoAdditions = new PullRequestCommitsQueryNoAdditions(
-      data.repo,
-      pullRequestNumber,
-      await getGithubToken(ctx),
-    )
-    result = await pullRequestCommitsQueryNoAdditions.getSinglePage(
-      data.page,
-      {
-        concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-        integrationId: ctx.integration.id,
-      },
-      getTokenRotator(ctx),
-    )
-  }
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  // getting additional member info for each commit
-  {
-    const response = result.data[0] as PullRequestCommit | PullRequestCommitNoAdditions
-    const commits = response.repository.pullRequest.commits.nodes
-
-    for (const record of commits) {
-      for (const author of record.commit.authors.nodes) {
-        if (!author || !author?.user || !author?.user?.login) {
-          // eslint-disable-next-line no-continue
-          continue
-        }
-        const member = await prepareMember(author.user, ctx)
-
-        // publish data
-        await ctx.processData<GithubApiData>({
-          type: GithubActivityType.AUTHORED_COMMIT,
-          data: record,
-          sourceParentId: response.repository.pullRequest.id,
-          member,
-          repo: data.repo,
-          isOld: true,
-        })
-      }
-    }
-  }
-}
-
-const processIssuesStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const issuesQuery = new IssuesQuery(data.repo, await getGithubToken(ctx))
-  const result = await issuesQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  for (const issue of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (issue.author?.login) {
-      member = await prepareMember(issue.author, ctx)
-    } else if (issue.authorBot?.login) {
-      member = prepareBotMember(issue.authorBot)
-    } else if (issue.author === null && issue.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn('Issue author is not found. This issue will not be parsed.')
-      continue
-    }
-
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.ISSUE_OPENED,
-      data: issue,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-
-    // now need to parse issue events
-    for (const issueEvent of issue.timelineItems.nodes) {
-      switch (issueEvent.__typename) {
-        case GithubPullRequestEvents.CLOSE: {
-          let member: GithubPrepareMemberOutput
-          if (issueEvent.actor?.login) {
-            member = await prepareMember(issueEvent.actor, ctx)
-          } else if (issueEvent.actorBot?.login) {
-            member = prepareBotMember(issueEvent.actorBot)
-          } else if (issueEvent.actor === null && issueEvent.actorBot === null) {
-            member = prepareDeletedMember()
-          } else {
-            ctx.log.warn('Issue event author is not found. This issue event will not be parsed.')
-            continue
-          }
-          await ctx.processData<GithubApiData>({
-            type: GithubActivityType.ISSUE_CLOSED,
-            data: issueEvent,
-            relatedData: issue,
-            member,
-            repo: data.repo,
-            isOld: true,
-          })
-
-          break
-        }
-        default:
-          ctx.log.warn(
-            `Unsupported issue event:  ${issueEvent.__typename}. This event will not be parsed.`,
-          )
-      }
-    }
-  }
-
-  // add each issue as separate stream for comments inside
-  for (const issue of result.data) {
-    await ctx.publishStream<GithubBasicStream>(
-      `${GithubStreamType.ISSUE_COMMENTS}:${issue.number}:firstPage`,
-      {
-        repo: data.repo,
-        page: '',
-        issueNumber: issue.number,
-      },
-    )
-  }
-}
-
-const processIssueCommentsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const issueNumber = data.issueNumber
-  const issueCommentsQuery = new IssueCommentsQuery(
-    data.repo,
-    issueNumber,
-    await getGithubToken(ctx),
-  )
-  const result = await issueCommentsQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  // get additional member info for each comment
-  for (const record of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (record.author?.login) {
-      member = await prepareMember(record.author, ctx)
-    } else if (record.authorBot?.login) {
-      member = prepareBotMember(record.authorBot)
-    } else if (record.author === null && record.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn('Issue comment author is not found. This issue comment will not be parsed.')
-      continue
-    }
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.ISSUE_COMMENT,
-      data: record,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-  }
-}
-
-const processDiscussionsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const discussionsQuery = new DiscussionsQuery(data.repo, await getGithubToken(ctx))
-  const result = await discussionsQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  // get additional member info for each comment
-  for (const discussion of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (discussion.author?.login) {
-      member = await prepareMember(discussion.author, ctx)
-    } else if (discussion.authorBot?.login) {
-      member = prepareBotMember(discussion.authorBot)
-    } else if (discussion.author === null && discussion.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn('Discussion author is not found. This discussion will not be parsed.')
-      continue
-    }
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.DISCUSSION_STARTED,
-      data: discussion,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-  }
-
-  // add each discussion as separate stream for comments inside
-  for (const d of result.data.filter((d) => d.comments.totalCount > 0)) {
-    await ctx.publishStream<GithubBasicStream>(
-      `${GithubStreamType.DISCUSSION_COMMENTS}:${d.id}:firstPage`,
-      {
-        repo: data.repo,
-        page: '',
-        discussionNumber: d.number,
-      },
-    )
-  }
-}
-
-const processDiscussionCommentsStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const discussionCommentsQuery = new DiscussionCommentsQuery(
-    data.repo,
-    data.discussionNumber,
-    await getGithubToken(ctx),
-  )
-  const result = await discussionCommentsQuery.getSinglePage(
-    data.page,
-    {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    },
-    getTokenRotator(ctx),
-  )
-  // handle next page
-  await publishNextPageStream(ctx, result)
-
-  for (const record of result.data) {
-    let member: GithubPrepareMemberOutput
-    if (record.author?.login) {
-      member = await prepareMember(record.author, ctx)
-    } else if (record.authorBot?.login) {
-      member = prepareBotMember(record.authorBot)
-    } else if (record.author === null && record.authorBot === null) {
-      member = prepareDeletedMember()
-    } else {
-      ctx.log.warn(
-        'Discussion comment author is not found. This discussion comment will not be parsed.',
-      )
-      continue
-    }
-    const commentId = record.id
-
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.DISCUSSION_COMMENT,
-      subType: GithubActivitySubType.DISCUSSION_COMMENT_START,
-      data: record,
-      member,
-      repo: data.repo,
-      isOld: true,
-    })
-
-    // going through replies
-    for (const reply of record.replies.nodes) {
-      let member: GithubPrepareMemberOutput
-      if (reply.author?.login) {
-        member = await prepareMember(reply.author, ctx)
-      } else if (reply.authorBot?.login) {
-        member = prepareBotMember(reply.authorBot)
-      } else if (reply.author === null && reply.authorBot === null) {
-        member = prepareDeletedMember()
-      } else {
-        ctx.log.warn(
-          'Discussion comment reply author is not found. This discussion comment reply will not be parsed.',
-        )
-        continue
-      }
-
-      // publish data
-      await ctx.processData<GithubApiData>({
-        type: GithubActivityType.DISCUSSION_COMMENT,
-        subType: GithubActivitySubType.DISCUSSION_COMMENT_REPLY,
-        data: reply,
-        member,
-        sourceParentId: commentId,
-        repo: data.repo,
-        isOld: true,
-      })
-    }
-  }
-}
-
-const handler: ProcessStreamHandler = async (ctx) => {
-  await timeout(1000)
-  const streamIdentifier = ctx.stream.identifier
-  if (streamIdentifier.startsWith(GithubStreamType.ROOT)) {
-    await processRootStream(ctx)
-  } else {
-    const data = ctx.stream.data as GithubBasicStream
-    const repo = getRepoByName(data.repo.name, ctx)
-
-    if (repo === null) {
-      await ctx.abortWithError(
-        `Stream ${ctx.stream.identifier} can't be processed since repo ${data.repo.name} is not found!`,
-        {
-          repoName: data.repo.name,
-          streamIdentifier: ctx.stream.identifier,
-        },
-      )
-    }
-
-    if (!repo.available) {
-      await ctx.abortWithError(
-        `Stream ${ctx.stream.identifier} can't be processed since repo ${data.repo.name} is not available!`,
-        {
-          repoName: data.repo.name,
-          streamIdentifier: ctx.stream.identifier,
-        },
-      )
-    }
-
-    // if all checks are passed, we can start processing
-
-    // Extract the stream type from the identifier
-    const streamType = streamIdentifier.split(':')[0]
-
-    switch (streamType) {
-      case GithubStreamType.STARGAZERS:
-        await processStargazersStream(ctx)
-        break
-      case GithubStreamType.FORKS:
-        await processForksStream(ctx)
-        break
-      case GithubStreamType.PULLS:
-        await processPullsStream(ctx)
-        break
-      case GithubStreamType.PULL_COMMENTS:
-        await processPullCommentsStream(ctx)
-        break
-      case GithubStreamType.PULL_REVIEW_THREADS:
-        await processPullReviewThreadsStream(ctx)
-        break
-      case GithubStreamType.PULL_REVIEW_THREAD_COMMENTS:
-        await processPullReviewThreadCommentsStream(ctx)
-        break
-      case GithubStreamType.PULL_COMMITS:
-        await processPullCommitsStream(ctx)
-        break
-      case GithubStreamType.ISSUES:
-        await processIssuesStream(ctx)
-        break
-      case GithubStreamType.ISSUE_COMMENTS:
-        await processIssueCommentsStream(ctx)
-        break
-      case GithubStreamType.DISCUSSIONS:
-        await processDiscussionsStream(ctx)
-        break
-      case GithubStreamType.DISCUSSION_COMMENTS:
-        await processDiscussionCommentsStream(ctx)
-        break
-      default:
-        console.error(`No matching process function for streamType: ${streamType}`)
-    }
-  }
-}
-
-export default handler
diff --git a/services/libs/integrations/src/integrations/github-old/processWebhookStream.ts b/services/libs/integrations/src/integrations/github-old/processWebhookStream.ts
deleted file mode 100644
index ae82b8cab8..0000000000
--- a/services/libs/integrations/src/integrations/github-old/processWebhookStream.ts
+++ /dev/null
@@ -1,475 +0,0 @@
-/* eslint-disable  @typescript-eslint/no-explicit-any */
-import verifyGithubWebhook from 'verify-github-webhook'
-
-import {
-  IProcessStreamContext,
-  IProcessWebhookStreamContext,
-  ProcessWebhookStreamHandler,
-} from '../../types'
-
-import getMember from './api/graphql/members'
-import getOrganization from './api/graphql/organizations'
-import TeamsQuery from './api/graphql/teams'
-import { GithubWebhookTeam } from './api/graphql/types'
-import { prepareBotMember, prepareMember } from './processStream'
-import {
-  getConcurrentRequestLimiter,
-  getGithubToken,
-  processPullCommitsStream,
-} from './processStream'
-import {
-  GithubBasicStream,
-  GithubPlatformSettings,
-  GithubPrepareMemberOutput,
-  GithubPrepareOrgMemberOutput,
-  GithubStreamType,
-  GithubWebhookData,
-  GithubWebhookPayload,
-  GithubWebhookSubType,
-  GithubWehookEvent,
-  Repo,
-} from './types'
-
-const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
-
-const handleWebhookSender = async (
-  sender: any,
-  ctx: IProcessWebhookStreamContext,
-): Promise<GithubPrepareMemberOutput> => {
-  if (!sender) {
-    return undefined
-  }
-  if (!sender.type) {
-    ctx.log.error('Sender type is not defined in handleWebhookSender')
-    throw new Error('Sender type is not defined in handleWebhookSender')
-  }
-  if (sender.type === 'Bot') {
-    return prepareBotMember(sender)
-  } else if (sender.type === 'User') {
-    return prepareWebhookMember(sender.login, ctx)
-  } else {
-    ctx.log.error('Sender type is not supported in handleWebhookSender')
-    throw new Error('Sender type is not supported in handleWebhookSender')
-  }
-}
-
-const handleWebhookOrgSender = async (
-  sender: any,
-  ctx: IProcessWebhookStreamContext,
-): Promise<GithubPrepareOrgMemberOutput> => {
-  if (sender.type !== 'Organization') {
-    ctx.log.error('Sender is not an organization in handleWebhookOrgSender')
-    throw new Error('Sender is not an organization in handleWebhookOrgSender')
-  }
-  const token = await getGithubToken(ctx as IProcessStreamContext)
-  const orgFromApi = await getOrganization(sender.login, token)
-  if (!orgFromApi) {
-    ctx.log.warn(
-      { org: sender.login },
-      `Organization ${sender.login} not found in GitHub while fetching it from webhook data, skipping!`,
-    )
-    return null
-  }
-  return {
-    orgFromApi,
-  }
-}
-
-const prepareWebhookMember = async (
-  login: string,
-  ctx: IProcessWebhookStreamContext,
-): Promise<GithubPrepareMemberOutput> => {
-  if (IS_TEST_ENV) {
-    return {
-      memberFromApi: {
-        login: 'testMember',
-        name: 'testMember',
-      },
-      email: '',
-      orgs: [],
-    }
-  }
-
-  if (!login) {
-    ctx.log.warn('No login in webhook, skipping!')
-    return null
-  }
-
-  const token = await getGithubToken(ctx as IProcessStreamContext)
-  const member = await getMember(login, token)
-
-  if (!member) {
-    ctx.log.warn(
-      { login },
-      `Member ${login} not found in GitHub while fetching it from webhook data, skipping!`,
-    )
-    return null
-  }
-
-  const preparedMember = await prepareMember(member, ctx as IProcessStreamContext)
-  return preparedMember
-}
-
-async function verifyWebhookSignature(
-  signature: string,
-  data: any,
-  ctx: IProcessWebhookStreamContext,
-): Promise<void> {
-  if (IS_TEST_ENV) {
-    return
-  }
-
-  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
-  const secret = GITHUB_CONFIG.webhookSecret
-
-  let isVerified: boolean
-  try {
-    isVerified = verifyGithubWebhook(signature, JSON.stringify(data), secret) // Returns true if verification succeeds; otherwise, false.
-  } catch (err) {
-    await ctx.abortWithError(`Error during Github webhook verificaion\n${err}`)
-  }
-
-  if (!isVerified) {
-    await ctx.abortWithError('Github webhook not verified')
-  }
-}
-
-const parseWebhookIssue = async (payload: any, ctx: IProcessWebhookStreamContext) => {
-  const member = await handleWebhookSender(payload?.sender, ctx)
-
-  if (member) {
-    await ctx.processData<GithubWebhookData>({
-      webhookType: GithubWehookEvent.ISSUES,
-      data: payload,
-      member,
-    })
-  }
-}
-
-const parseWebhookDiscussion = async (payload: any, ctx: IProcessWebhookStreamContext) => {
-  let member: GithubPrepareMemberOutput | undefined
-  if (payload.action === 'answered') {
-    member = await handleWebhookSender(payload?.sender, ctx)
-
-    if (member) {
-      await ctx.processData<GithubWebhookData>({
-        webhookType: GithubWehookEvent.DISCUSSION,
-        subType: GithubWebhookSubType.DISCUSSION_COMMENT_REPLY,
-        data: payload,
-        member,
-      })
-    }
-  }
-
-  if (!['edited', 'created'].includes(payload.action)) {
-    return
-  }
-
-  const discussion = payload.discussion
-  member = await handleWebhookSender(discussion?.user, ctx)
-
-  if (member) {
-    await ctx.processData<GithubWebhookData>({
-      webhookType: GithubWehookEvent.DISCUSSION,
-      subType: GithubWebhookSubType.DISCUSSION_COMMENT_START,
-      data: payload,
-      member,
-    })
-  }
-}
-
-const parseWebhookPullRequestEvents = async (
-  payload: any,
-  ctx: IProcessWebhookStreamContext,
-): Promise<void> => {
-  const member = await handleWebhookSender(payload?.sender, ctx)
-  let objectMember: GithubPrepareMemberOutput | undefined
-
-  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
-  const IS_GITHUB_COMMIT_DATA_ENABLED = GITHUB_CONFIG.isCommitDataEnabled === 'true'
-
-  switch (payload.action) {
-    case 'edited':
-    case 'opened':
-    case 'reopened':
-    case 'closed':
-    case 'merged': {
-      if (member) {
-        await ctx.processData<GithubWebhookData>({
-          webhookType: GithubWehookEvent.PULL_REQUEST,
-          data: payload,
-          member,
-        })
-      }
-      break
-    }
-    case 'assigned': {
-      objectMember = await handleWebhookSender(payload?.requested_reviewer, ctx)
-
-      if (member && objectMember) {
-        await ctx.processData<GithubWebhookData>({
-          webhookType: GithubWehookEvent.PULL_REQUEST,
-          data: payload,
-          member,
-          objectMember,
-        })
-      }
-      break
-    }
-    case 'review_requested': {
-      objectMember = await handleWebhookSender(payload?.requested_reviewers?.[0], ctx)
-
-      if (member && objectMember) {
-        await ctx.processData<GithubWebhookData>({
-          webhookType: GithubWehookEvent.PULL_REQUEST,
-          data: payload,
-          member,
-          objectMember,
-        })
-      }
-      break
-    }
-    case 'synchronize': {
-      if (IS_GITHUB_COMMIT_DATA_ENABLED) {
-        const prNumber = payload.number
-        const repo: Repo = {
-          name: payload?.repository?.name,
-          owner: payload?.repository?.owner?.login,
-          url: payload?.repository?.html_url,
-          createdAt: payload?.repository?.created_at,
-        }
-
-        // this will create a CROWD_GENERATED webhook and stream for it
-        // this way we don't need integration run to publish new streams
-        await ctx.publishStream<GithubBasicStream>(
-          `${GithubStreamType.PULL_COMMITS}:${prNumber}:firstPage`,
-          {
-            repo,
-            page: '',
-            prNumber,
-          },
-        )
-      }
-      break
-    }
-  }
-}
-
-const parseWebhookPullRequest = async (payload: any, ctx: IProcessWebhookStreamContext) => {
-  // handle case of multiple reviewers (by assigning a team as a reviewer)
-  if (payload.action === 'review_requested' && payload.requested_team) {
-    // a team sent as reviewer, first we need to find members in this team
-    const team: GithubWebhookTeam = payload.requested_team
-    const token = await getGithubToken(ctx as IProcessStreamContext)
-    const teamMembers = await new TeamsQuery(team.node_id, token).getSinglePage('', {
-      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
-      integrationId: ctx.integration.id,
-    })
-
-    for (const teamMember of teamMembers.data) {
-      await parseWebhookPullRequestEvents({ ...payload, requested_reviewer: teamMember }, ctx)
-    }
-
-    return
-  }
-
-  if (payload.action === 'closed' && payload.pull_request.merged) {
-    const revisedPayload = { ...payload, action: 'merged' }
-    revisedPayload.pull_request.state = 'merged'
-
-    await parseWebhookPullRequestEvents(revisedPayload, ctx)
-
-    return
-  }
-
-  await parseWebhookPullRequestEvents(payload, ctx)
-}
-
-const parseWebhookPullRequestReview = async (
-  payload: any,
-  ctx: IProcessWebhookStreamContext,
-): Promise<void> => {
-  if (payload.action === 'submitted') {
-    // additional comments to existing review threads also result in submitted events
-    // since these will be handled in pull_request_review_comment.created events
-    // we're ignoring when state is commented and it has no body.
-    if (payload.review.state === 'commented' && payload.review.body === null) {
-      return
-    }
-
-    const member = await handleWebhookSender(payload?.sender, ctx)
-
-    if (member) {
-      await ctx.processData<GithubWebhookData>({
-        webhookType: GithubWehookEvent.PULL_REQUEST_REVIEW,
-        data: payload,
-        member,
-      })
-    }
-  }
-}
-
-const parseWebhookStar = async (payload: any, ctx: IProcessWebhookStreamContext, date: string) => {
-  if (payload.action === 'created' || payload.action === 'deleted') {
-    const member = await handleWebhookSender(payload?.sender, ctx)
-
-    if (member) {
-      await ctx.processData<GithubWebhookData>({
-        webhookType: GithubWehookEvent.STAR,
-        data: payload,
-        member,
-        date,
-      })
-    }
-  }
-}
-
-const parseWebhookFork = async (payload: any, ctx: IProcessWebhookStreamContext) => {
-  if (payload?.sender?.type === 'Organization') {
-    const member = await handleWebhookOrgSender(payload?.sender, ctx)
-
-    if (member) {
-      await ctx.processData<GithubWebhookData>({
-        webhookType: GithubWehookEvent.FORK,
-        data: payload,
-        orgMember: member,
-      })
-    }
-    return
-  }
-
-  const member = await handleWebhookSender(payload?.sender, ctx)
-
-  if (member) {
-    await ctx.processData<GithubWebhookData>({
-      webhookType: GithubWehookEvent.FORK,
-      data: payload,
-      member,
-    })
-  }
-}
-
-const parseWebhookComment = async (
-  event: string,
-  payload: any,
-  ctx: IProcessWebhookStreamContext,
-) => {
-  let type: GithubWehookEvent
-  let sourceParentId: string
-
-  switch (event) {
-    case 'discussion_comment': {
-      switch (payload.action) {
-        case 'created':
-        case 'edited':
-          type = GithubWehookEvent.DISCUSSION_COMMENT
-          sourceParentId = payload.discussion.node_id.toString()
-          break
-        default:
-          return undefined
-      }
-      break
-    }
-
-    case 'issue_comment': {
-      switch (payload.action) {
-        case 'created':
-        case 'edited': {
-          if ('pull_request' in payload.issue) {
-            type = GithubWehookEvent.PULL_REQUEST_COMMENT
-          } else {
-            type = GithubWehookEvent.ISSUE_COMMENT
-          }
-          sourceParentId = payload.issue.node_id.toString()
-          break
-        }
-
-        default:
-          return
-      }
-      break
-    }
-
-    default: {
-      return
-    }
-  }
-
-  const member = await handleWebhookSender(payload?.sender, ctx)
-
-  if (member) {
-    await ctx.processData<GithubWebhookData>({
-      webhookType: type,
-      data: payload,
-      member,
-      sourceParentId,
-    })
-  }
-}
-
-const parseWebhookPullRequestReviewComment = async (
-  payload: any,
-  ctx: IProcessWebhookStreamContext,
-) => {
-  if (payload.action === 'created') {
-    const member = await handleWebhookSender(payload?.comment?.user, ctx)
-
-    if (member) {
-      await ctx.processData<GithubWebhookData>({
-        webhookType: GithubWehookEvent.PULL_REQUEST_REVIEW_COMMENT,
-        data: payload,
-        member,
-      })
-    }
-  }
-}
-
-const handler: ProcessWebhookStreamHandler = async (ctx) => {
-  const identifier = ctx.stream.identifier
-  const webhookCreatedAt = ctx.stream.webhookCreatedAt
-
-  // this is for pull request commits which are published during runtime
-  if (identifier.startsWith(GithubStreamType.PULL_COMMITS)) {
-    // we are reusing code here with another type of context
-    // everything should work except for ctx.aborRuntWithError
-    await processPullCommitsStream(ctx as IProcessStreamContext)
-  } else {
-    // this is for normal weqbook events
-    const { signature, event, data } = ctx.stream.data as GithubWebhookPayload
-
-    await verifyWebhookSignature(signature, data, ctx)
-
-    switch (event) {
-      case GithubWehookEvent.ISSUES:
-        await parseWebhookIssue(data, ctx)
-        break
-      case GithubWehookEvent.DISCUSSION:
-        await parseWebhookDiscussion(data, ctx)
-        break
-      case GithubWehookEvent.PULL_REQUEST:
-        await parseWebhookPullRequest(data, ctx)
-        break
-      case GithubWehookEvent.PULL_REQUEST_REVIEW:
-        await parseWebhookPullRequestReview(data, ctx)
-        break
-      case GithubWehookEvent.STAR:
-        await parseWebhookStar(data, ctx, webhookCreatedAt)
-        break
-      case GithubWehookEvent.FORK:
-        await parseWebhookFork(data, ctx)
-        break
-      case GithubWehookEvent.DISCUSSION_COMMENT:
-      case GithubWehookEvent.ISSUE_COMMENT:
-        await parseWebhookComment(event, data, ctx)
-        break
-      case GithubWehookEvent.PULL_REQUEST_REVIEW_COMMENT:
-        await parseWebhookPullRequestReviewComment(data, ctx)
-        break
-      default:
-        ctx.log.debug({ event }, 'Unknown Github webhook event!')
-        return
-    }
-  }
-}
-
-export default handler
diff --git a/services/libs/integrations/src/integrations/github/cap.ts b/services/libs/integrations/src/integrations/github-snowflake/cap.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github/cap.ts
rename to services/libs/integrations/src/integrations/github-snowflake/cap.ts
diff --git a/services/libs/integrations/src/integrations/github-snowflake/generateStreams.ts b/services/libs/integrations/src/integrations/github-snowflake/generateStreams.ts
new file mode 100644
index 0000000000..2b0455c9bb
--- /dev/null
+++ b/services/libs/integrations/src/integrations/github-snowflake/generateStreams.ts
@@ -0,0 +1,43 @@
+import { GenerateStreamsHandler } from '../../types'
+
+import { GithubIntegrationSettings, GithubRootStream, GithubStreamType, Repo } from './types'
+
+const NEW_REPO_THRESHOLD_MS = 20000 // 20 seconds in milliseconds
+
+interface AdditionalInfo {
+  messageSentAt: string
+}
+
+const isRepoRecentlyUpdated = (repo: Repo, messageSentAt?: Date): boolean => {
+  if (!repo.updatedAt) return true // If no updatedAt, process it to be safe
+
+  if (messageSentAt) {
+    // For newly added repos, check if they were updated within 20 seconds of the message
+    const repoUpdateTime = new Date(repo.updatedAt).getTime()
+    const messageTime = messageSentAt.getTime()
+    return Math.abs(repoUpdateTime - messageTime) < NEW_REPO_THRESHOLD_MS
+  }
+
+  return true
+}
+
+const handler: GenerateStreamsHandler = async (ctx) => {
+  const messageSentAt = (ctx.additionalInfo as AdditionalInfo)?.messageSentAt
+    ? new Date((ctx.additionalInfo as AdditionalInfo).messageSentAt)
+    : undefined
+  const settings = ctx.integration.settings as GithubIntegrationSettings
+  const reposToCheck = ctx.onboarding
+    ? settings.orgs
+        .flatMap((org) => org.repos)
+        .filter((repo) => isRepoRecentlyUpdated(repo, messageSentAt))
+    : // for onboarding runs, we only check recently added repos. This needed when integration updated
+      settings.orgs.flatMap((org) => org.repos) // for non-onboarding runs, we check all repos
+
+  ctx.log.info(`${messageSentAt ? messageSentAt.toISOString() : 'Checking all repos'}`)
+
+  await ctx.publishStream<GithubRootStream>(GithubStreamType.ROOT, {
+    reposToCheck,
+  })
+}
+
+export default handler
diff --git a/services/libs/integrations/src/integrations/github-old/grid.ts b/services/libs/integrations/src/integrations/github-snowflake/grid.ts
similarity index 66%
rename from services/libs/integrations/src/integrations/github-old/grid.ts
rename to services/libs/integrations/src/integrations/github-snowflake/grid.ts
index 8bc78e95b5..935d7394d3 100644
--- a/services/libs/integrations/src/integrations/github-old/grid.ts
+++ b/services/libs/integrations/src/integrations/github-snowflake/grid.ts
@@ -3,14 +3,6 @@ import { IActivityScoringGrid } from '@crowd/types'
 import { GithubActivityType } from './types'
 
 export const GITHUB_GRID: Record<GithubActivityType, IActivityScoringGrid> = {
-  [GithubActivityType.DISCUSSION_STARTED]: {
-    score: 8,
-    isContribution: true,
-  },
-  [GithubActivityType.DISCUSSION_COMMENT]: {
-    score: 6,
-    isContribution: true,
-  },
   [GithubActivityType.FORK]: {
     score: 4,
     isContribution: false,
@@ -43,30 +35,14 @@ export const GITHUB_GRID: Record<GithubActivityType, IActivityScoringGrid> = {
     score: 2,
     isContribution: false,
   },
-  [GithubActivityType.UNSTAR]: {
-    score: -2,
-    isContribution: false,
-  },
   [GithubActivityType.PULL_REQUEST_MERGED]: {
     score: 6,
     isContribution: true,
   },
-  [GithubActivityType.PULL_REQUEST_ASSIGNED]: {
-    score: 2,
-    isContribution: false,
-  },
   [GithubActivityType.PULL_REQUEST_REVIEWED]: {
     score: 8,
     isContribution: true,
   },
-  [GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED]: {
-    score: 2,
-    isContribution: false,
-  },
-  [GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT]: {
-    score: 6,
-    isContribution: true,
-  },
   [GithubActivityType.AUTHORED_COMMIT]: {
     score: 2,
     isContribution: true,
diff --git a/services/libs/integrations/src/integrations/github-old/index.ts b/services/libs/integrations/src/integrations/github-snowflake/index.ts
similarity index 90%
rename from services/libs/integrations/src/integrations/github-old/index.ts
rename to services/libs/integrations/src/integrations/github-snowflake/index.ts
index 4be45d94de..0304d07142 100644
--- a/services/libs/integrations/src/integrations/github-old/index.ts
+++ b/services/libs/integrations/src/integrations/github-snowflake/index.ts
@@ -10,12 +10,13 @@ import processStream from './processStream'
 import processWebhookStream from './processWebhookStream'
 
 const descriptor: IIntegrationDescriptor = {
-  type: PlatformType.GITHUB_OLD,
+  type: PlatformType.GITHUB_SNOWFLAKE,
   memberAttributes: GITHUB_MEMBER_ATTRIBUTES,
+  checkEvery: 24 * 60, // 24 hours
   generateStreams,
   processStream,
-  processWebhookStream,
   processData,
+  processWebhookStream,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   postProcess: (settings: any) => {
     return settings
diff --git a/services/libs/integrations/src/integrations/github-old/memberAttributes.ts b/services/libs/integrations/src/integrations/github-snowflake/memberAttributes.ts
similarity index 88%
rename from services/libs/integrations/src/integrations/github-old/memberAttributes.ts
rename to services/libs/integrations/src/integrations/github-snowflake/memberAttributes.ts
index 8ad671c37e..ea05cb7d1e 100644
--- a/services/libs/integrations/src/integrations/github-old/memberAttributes.ts
+++ b/services/libs/integrations/src/integrations/github-snowflake/memberAttributes.ts
@@ -55,4 +55,11 @@ export const GITHUB_MEMBER_ATTRIBUTES: IMemberAttribute[] = [
     canDelete: false,
     show: true,
   },
+  {
+    name: MemberAttributes[MemberAttributeName.IS_BOT].name,
+    label: MemberAttributes[MemberAttributeName.IS_BOT].label,
+    type: MemberAttributeType.BOOLEAN,
+    canDelete: false,
+    show: true,
+  },
 ]
diff --git a/services/libs/integrations/src/integrations/github-snowflake/processData.ts b/services/libs/integrations/src/integrations/github-snowflake/processData.ts
new file mode 100644
index 0000000000..0737b80555
--- /dev/null
+++ b/services/libs/integrations/src/integrations/github-snowflake/processData.ts
@@ -0,0 +1,639 @@
+/* eslint-disable  @typescript-eslint/no-explicit-any */
+// processStream.ts content
+// processData.ts content
+import {
+  type IGetRepoForksResult,
+  type IGetRepoIssueCommentsResult,
+  type IGetRepoIssuesResult,
+  type IGetRepoPullRequestReviewCommentsResult,
+  type IGetRepoPullRequestReviewsResult,
+  type IGetRepoPullRequestsResult,
+  type IGetRepoPushesResult,
+  type IGetRepoStargazersResult,
+} from '@crowd/snowflake'
+import {
+  IActivityData,
+  IMemberData,
+  IOrganization,
+  MemberAttributeName,
+  MemberIdentityType,
+  OrganizationIdentityType,
+  OrganizationSource,
+  PlatformType,
+} from '@crowd/types'
+
+import { generateSourceIdHash } from '../../helpers'
+import { ProcessDataHandler } from '../../types'
+import { default as oldHandler } from '../github/processData'
+
+import { GITHUB_GRID } from './grid'
+import { GithubActivityType, GithubApiData, GithubPrepareMemberOutput } from './types'
+
+const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
+
+const parseBotMember = (memberData: GithubPrepareMemberOutput): IMemberData => {
+  const member: IMemberData = {
+    identities: [
+      {
+        platform: PlatformType.GITHUB,
+        value: memberData.memberFromApi.login,
+        type: MemberIdentityType.USERNAME,
+        verified: true,
+      },
+    ],
+    displayName: memberData.memberFromApi.login,
+    attributes: {
+      [MemberAttributeName.URL]: {
+        [PlatformType.GITHUB]: memberData.memberFromApi?.url || '',
+      },
+      [MemberAttributeName.AVATAR_URL]: {
+        [PlatformType.GITHUB]: memberData.memberFromApi?.avatarUrl || '',
+      },
+      [MemberAttributeName.SOURCE_ID]: {
+        [PlatformType.GITHUB]: memberData.memberFromApi?.id?.toString() || '',
+      },
+      [MemberAttributeName.IS_BOT]: {
+        [PlatformType.GITHUB]: true,
+      },
+    },
+  }
+
+  return member
+}
+
+const parseDeletedMember = (memberData: GithubPrepareMemberOutput): IMemberData => {
+  const member: IMemberData = {
+    identities: [
+      {
+        platform: PlatformType.GITHUB,
+        value: memberData.memberFromApi.login,
+        type: MemberIdentityType.USERNAME,
+        verified: true,
+      },
+    ],
+    displayName: 'Deleted User',
+    attributes: {
+      [MemberAttributeName.URL]: {
+        [PlatformType.GITHUB]: memberData.memberFromApi?.url || '',
+      },
+      [MemberAttributeName.AVATAR_URL]: {
+        [PlatformType.GITHUB]: memberData.memberFromApi?.avatarUrl || '',
+      },
+      [MemberAttributeName.BIO]: {
+        [PlatformType.GITHUB]:
+          "Hi, I'm @ghost! I take the place of user accounts that have been deleted. :ghost:",
+      },
+    },
+  }
+
+  return member
+}
+
+const parseMember = (
+  memberData: GithubPrepareMemberOutput,
+  additionalEmails?: string[],
+): IMemberData => {
+  const { email, org, memberFromApi } = memberData
+
+  if (memberFromApi.isBot && memberFromApi.isDeleted) {
+    throw new Error('Member cannot be both bot and deleted')
+  }
+
+  if (memberFromApi.isBot) {
+    return parseBotMember(memberData)
+  }
+
+  if (memberFromApi.isDeleted) {
+    return parseDeletedMember(memberData)
+  }
+
+  const member: IMemberData = {
+    identities: [
+      {
+        platform: PlatformType.GITHUB,
+        value: memberFromApi.login,
+        type: MemberIdentityType.USERNAME,
+        sourceId: memberFromApi.id.toString(),
+        verified: true,
+      },
+    ],
+    displayName: memberFromApi?.name?.trim() || memberFromApi.login,
+    attributes: {
+      [MemberAttributeName.IS_HIREABLE]: {
+        [PlatformType.GITHUB]: memberFromApi.isHireable || false,
+      },
+      [MemberAttributeName.URL]: {
+        [PlatformType.GITHUB]: memberFromApi.url,
+      },
+      [MemberAttributeName.BIO]: {
+        [PlatformType.GITHUB]: memberFromApi.bio || '',
+      },
+      [MemberAttributeName.LOCATION]: {
+        [PlatformType.GITHUB]: memberFromApi.location || '',
+      },
+      [MemberAttributeName.AVATAR_URL]: {
+        [PlatformType.GITHUB]: memberFromApi.avatarUrl || '',
+      },
+      [MemberAttributeName.COMPANY]: {
+        [PlatformType.GITHUB]: memberFromApi.company || '',
+      },
+    },
+  }
+
+  if (email) {
+    member.identities.push({
+      platform: PlatformType.GITHUB,
+      value: email,
+      type: MemberIdentityType.EMAIL,
+      verified: true,
+    })
+  }
+
+  if (additionalEmails) {
+    additionalEmails
+      .filter((email) => email.trim() && email.includes('@'))
+      .forEach((email) => {
+        member.identities.push({
+          platform: PlatformType.GITHUB,
+          value: email,
+          type: MemberIdentityType.EMAIL,
+          verified: true,
+        })
+      })
+  }
+
+  if (memberFromApi?.twitterUsername) {
+    member.identities.push({
+      platform: PlatformType.TWITTER,
+      value: memberFromApi.twitterUsername,
+      type: MemberIdentityType.USERNAME,
+      verified: false,
+    })
+  }
+
+  if (memberFromApi.websiteUrl) {
+    member.attributes[MemberAttributeName.WEBSITE_URL] = {
+      [PlatformType.GITHUB]: memberFromApi.websiteUrl,
+    }
+  }
+
+  if (memberFromApi.company) {
+    if (IS_TEST_ENV) {
+      member.organizations = [
+        {
+          attributes: {
+            name: {
+              integration: ['crowd.dev'],
+            },
+          },
+          identities: [
+            {
+              value: 'crowd.dev',
+              platform: PlatformType.GITHUB,
+              type: OrganizationIdentityType.USERNAME,
+              verified: true,
+            },
+          ],
+          source: OrganizationSource.GITHUB,
+        },
+      ]
+    } else {
+      const company = memberFromApi.company.replace('@', '').trim()
+
+      if (org && company.length > 0) {
+        const organizationPayload: IOrganization = {
+          displayName: org.login,
+          identities: [
+            {
+              platform: PlatformType.GITHUB,
+              type: OrganizationIdentityType.USERNAME,
+              value: org.login,
+              verified: true,
+            },
+          ],
+          logo: org.avatarUrl ?? null,
+          source: OrganizationSource.GITHUB,
+        }
+
+        member.organizations = [organizationPayload]
+      }
+    }
+  }
+
+  return member
+}
+
+const parseStar: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoStargazersResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.STAR,
+    sourceId: generateSourceIdHash(
+      data.actorLogin,
+      GithubActivityType.STAR,
+      Math.floor(new Date(data.timestamp).getTime() / 1000).toString(),
+      PlatformType.GITHUB,
+    ),
+    sourceParentId: '',
+    timestamp: new Date(data.timestamp).toISOString(),
+    channel: apiData.repo.url,
+    member,
+    score: GITHUB_GRID.star.score,
+    isContribution: GITHUB_GRID.star.isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parseFork: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+
+  // if (apiData.orgMember && !apiData.member) {
+  //   await parseForkByOrg(ctx)
+  //   return
+  // } else if (apiData.member && apiData.orgMember) {
+  //   throw new Error('Both member and orgMember are present')
+  // } else if (!apiData.member && !apiData.orgMember) {
+  //   throw new Error('Both member and orgMember are missing')
+  // }
+
+  const data = apiData.data as IGetRepoForksResult
+  // const relatedData = apiData.relatedData
+  const memberData = apiData.member
+  // const subType = apiData.subType
+
+  const member = parseMember(memberData)
+
+  // if (subType && subType === INDIRECT_FORK) {
+  //   const activity: IActivityData = {
+  //     type: GithubActivityType.FORK,
+  //     sourceId: data.id,
+  //     sourceParentId: '',
+  //     timestamp: new Date(data.createdAt).toISOString(),
+  //     channel: apiData.repo.url,
+  //     member,
+  //     score: GITHUB_GRID.fork.score,
+  //     isContribution: GITHUB_GRID.fork.isContribution,
+  //     attributes: {
+  //       isIndirectFork: true,
+  //       directParent: relatedData.url,
+  //     },
+  //   }
+
+  //   await ctx.publishActivity(activity)
+  //   return
+  // }
+
+  const activity: IActivityData = {
+    type: GithubActivityType.FORK,
+    sourceId: data.payload.forkee.node_id,
+    sourceParentId: '',
+    timestamp: new Date(data.timestamp).toISOString(),
+    channel: apiData.repo.url,
+    member,
+    score: GITHUB_GRID.fork.score,
+    isContribution: GITHUB_GRID.fork.isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parsePullRequestOpened: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoPullRequestsResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_OPENED,
+    sourceId: data.payload.pull_request.node_id,
+    sourceParentId: '',
+    timestamp: new Date(data.timestamp).toISOString(),
+    body: data.payload.pull_request.body,
+    url: data.payload.pull_request._links.html.href,
+    channel: apiData.repo.url,
+    title: data.payload.pull_request.title,
+    attributes: {
+      state: data.payload.pull_request.state.toLowerCase(),
+      additions: data.payload.pull_request.additions,
+      deletions: data.payload.pull_request.deletions,
+      changedFiles: data.payload.pull_request.changed_files,
+      authorAssociation: data.payload.pull_request.author_association,
+      labels: data.payload.pull_request.labels?.map((l) => (l as any)?.name),
+      sha: data.payload.pull_request.head.sha,
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parsePullRequestClosed: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoPullRequestsResult
+  const memberData = apiData.member
+  const repo = apiData.repo
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_CLOSED,
+    sourceId: `gen-CE_${data.payload.pull_request.node_id}_${memberData.memberFromApi.login}_${new Date(
+      data.timestamp,
+    ).toISOString()}`,
+    sourceParentId: data.payload.pull_request.node_id,
+    timestamp: new Date(data.timestamp).toISOString(),
+    body: '',
+    url: data.payload.pull_request._links.html.href,
+    channel: repo.url,
+    title: '',
+    attributes: {
+      state: data.payload.pull_request.state.toLowerCase(),
+      additions: data.payload.pull_request.additions,
+      deletions: data.payload.pull_request.deletions,
+      changedFiles: data.payload.pull_request.changed_files,
+      authorAssociation: data.payload.pull_request.author_association,
+      labels: data.payload.pull_request.labels?.map((l) => (l as any)?.name),
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parsePullRequestReviewed: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoPullRequestReviewsResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_REVIEWED,
+    sourceId: `gen-PRR_${data.payload.pull_request.node_id}_${memberData.memberFromApi.login}_${new Date(
+      data.timestamp,
+    ).toISOString()}`,
+    sourceParentId: data.payload.pull_request.node_id,
+    timestamp: new Date(data.timestamp).toISOString(),
+    url: data.payload.pull_request._links.html.href,
+    channel: apiData.repo.url,
+    body: '',
+    title: '',
+    attributes: {
+      reviewState: data.state,
+      state: data.payload.pull_request.state.toLowerCase(),
+      authorAssociation: data.payload.pull_request.author_association,
+      labels: data.payload.pull_request.labels?.map((l) => (l as any)?.name),
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parsePullRequestMerged: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoPullRequestsResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_MERGED,
+    sourceId: `gen-ME_${data.payload.pull_request.node_id}_${memberData.memberFromApi.login}_${new Date(
+      data.timestamp,
+    ).toISOString()}`,
+    sourceParentId: data.payload.pull_request.node_id,
+    timestamp: new Date(data.timestamp).toISOString(),
+    body: '',
+    url: data.payload.pull_request.html_url,
+    channel: apiData.repo.url,
+    title: '',
+    attributes: {
+      state: data.payload.pull_request.state.toLowerCase(),
+      additions: data.payload.pull_request.additions,
+      deletions: data.payload.pull_request.deletions,
+      changedFiles: data.payload.pull_request.changed_files,
+      authorAssociation: data.payload.pull_request.author_association,
+      labels: data.payload.pull_request.labels?.map((l) => l.name),
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parseIssueOpened: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoIssuesResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.ISSUE_OPENED,
+    sourceId: data.payload.issue.node_id,
+    sourceParentId: '',
+    timestamp: new Date(data.timestamp).toISOString(),
+    body: data.payload.issue.body,
+    url: data.payload.issue.html_url,
+    channel: apiData.repo.url,
+    title: data.payload.issue.title,
+    attributes: {
+      state: data.payload.issue.state.toLowerCase(),
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.ISSUE_OPENED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.ISSUE_OPENED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parseIssueClosed: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoIssuesResult
+  const memberData = apiData.member
+  const repo = apiData.repo
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.ISSUE_CLOSED,
+    sourceId: `gen-CE_${data.payload.issue.node_id}_${memberData.memberFromApi.login}_${new Date(
+      data.timestamp,
+    ).toISOString()}`,
+    sourceParentId: data.payload.issue.node_id,
+    timestamp: new Date(data.timestamp).toISOString(),
+    body: '',
+    url: data.payload.issue.html_url,
+    channel: repo.url,
+    title: '',
+    attributes: {
+      state: data.payload.issue.state.toLowerCase(),
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.ISSUE_CLOSED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.ISSUE_CLOSED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parsePullRequestComment: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoPullRequestReviewCommentsResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_COMMENT,
+    sourceId: data.payload.comment.node_id,
+    sourceParentId: data.payload.pull_request.node_id,
+    timestamp: new Date(data.timestamp).toISOString(),
+    url: data.payload.comment._links.html.href,
+    body: data.payload.comment.body,
+    channel: apiData.repo.url,
+    member,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_COMMENT].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_COMMENT].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parseIssueComment: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoIssueCommentsResult
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.ISSUE_COMMENT,
+    sourceId: data.payload.comment.node_id,
+    sourceParentId: data.payload.issue.node_id,
+    timestamp: new Date(data.timestamp).toISOString(),
+    url: data.payload.comment.html_url,
+    body: data.payload.comment.body,
+    channel: apiData.repo.url,
+    member,
+    score: GITHUB_GRID[GithubActivityType.ISSUE_COMMENT].score,
+    isContribution: GITHUB_GRID[GithubActivityType.ISSUE_COMMENT].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parseAuthoredCommit: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as IGetRepoPushesResult
+  const memberData = apiData.member
+
+  for (const commit of data.payload.commits.filter((c) => c.distinct)) {
+    const activity: IActivityData = {
+      channel: apiData.repo.url,
+      url: `${apiData.repo.url}/commit/${commit.sha}`,
+      body: commit.message,
+      type: 'authored-commit',
+      sourceId: commit.sha,
+      timestamp: new Date(data.timestamp).toISOString(),
+      attributes: {
+        prSha: data.payloadHead,
+      },
+      // attributes: {
+      //   insertions: 'additions' in data.commit ? data.commit.additions : 0,
+      //   deletions: 'deletions' in data.commit ? data.commit.deletions : 0,
+      //   lines:
+      //     'additions' in data.commit && 'deletions' in data.commit
+      //       ? data.commit.additions - data.commit.deletions
+      //       : 0,
+      //   isMerge: data.commit.parents.totalCount > 1,
+      // },
+      member: parseMember(memberData, [commit.author.email]),
+      score: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].score,
+      isContribution: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].isContribution,
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const handler: ProcessDataHandler = async (ctx) => {
+  const data = ctx.data as any
+
+  const event = data?.type as GithubActivityType
+
+  // for webhoks we are using old code
+  const webhookEvent = data?.webhookType
+
+  const isOld = data?.isOld
+
+  // this is for old events that don't have pullRequestNodeId
+  // generated during webhooks for pull requests
+  if (event === GithubActivityType.AUTHORED_COMMIT && (isOld || 'sourceParentId' in data)) {
+    await oldHandler(ctx)
+    return
+  }
+
+  if (event) {
+    // parse github api data
+    switch (event) {
+      case GithubActivityType.STAR:
+        await parseStar(ctx)
+        break
+      case GithubActivityType.FORK:
+        await parseFork(ctx)
+        break
+      case GithubActivityType.PULL_REQUEST_OPENED:
+        await parsePullRequestOpened(ctx)
+        break
+      case GithubActivityType.PULL_REQUEST_CLOSED:
+        await parsePullRequestClosed(ctx)
+        break
+      case GithubActivityType.PULL_REQUEST_COMMENT:
+        await parsePullRequestComment(ctx)
+        break
+      case GithubActivityType.PULL_REQUEST_REVIEWED:
+        await parsePullRequestReviewed(ctx)
+        break
+      case GithubActivityType.PULL_REQUEST_MERGED:
+        await parsePullRequestMerged(ctx)
+        break
+      case GithubActivityType.ISSUE_OPENED:
+        await parseIssueOpened(ctx)
+        break
+      case GithubActivityType.ISSUE_CLOSED:
+        await parseIssueClosed(ctx)
+        break
+      case GithubActivityType.ISSUE_COMMENT:
+        await parseIssueComment(ctx)
+        break
+      case GithubActivityType.AUTHORED_COMMIT:
+        await parseAuthoredCommit(ctx)
+        break
+      default:
+        await ctx.abortWithError(`Event not supported '${event}'!`)
+    }
+  } else if (webhookEvent) {
+    await oldHandler(ctx)
+  } else {
+    await ctx.abortWithError('No event type found in data!')
+  }
+}
+
+export default handler
diff --git a/services/libs/integrations/src/integrations/github-snowflake/processStream.ts b/services/libs/integrations/src/integrations/github-snowflake/processStream.ts
new file mode 100644
index 0000000000..5abc9f19a7
--- /dev/null
+++ b/services/libs/integrations/src/integrations/github-snowflake/processStream.ts
@@ -0,0 +1,420 @@
+// processStream.ts content
+import {
+  GithubSnowflakeClient,
+  IBasicResponse,
+  IGetResponse,
+  SnowflakeClient,
+} from '@crowd/snowflake'
+
+import { IProcessStreamContext, ProcessStreamHandler } from '../../types'
+
+import { capGithubArchive } from './cap'
+import {
+  GithubActivityType,
+  GithubApiData,
+  GithubBasicStream,
+  GithubPlatformSettings,
+  GithubPrepareMemberOutput,
+  GithubRootStream,
+  GithubStreamType,
+} from './types'
+
+let sf: SnowflakeClient | undefined = undefined
+let gh: GithubSnowflakeClient | undefined = undefined
+
+let sfIncremental: SnowflakeClient | undefined = undefined
+let ghIncremental: GithubSnowflakeClient | undefined = undefined
+
+const initClient = (ctx: IProcessStreamContext) => {
+  const settings = ctx.platformSettings as GithubPlatformSettings
+  sf = new SnowflakeClient({
+    privateKeyString: settings.sfPrivateKey,
+    account: settings.sfAccount,
+    username: settings.sfUsername,
+    database: settings.sfDatabase,
+    warehouse: settings.sfWarehouse,
+    role: settings.sfRole,
+    parentLog: ctx.log,
+  })
+  gh = new GithubSnowflakeClient(sf)
+}
+
+const initIncrementalClient = (ctx: IProcessStreamContext) => {
+  const settings = ctx.platformSettings as GithubPlatformSettings
+  sfIncremental = new SnowflakeClient({
+    privateKeyString: settings.sfPrivateKey,
+    account: settings.sfAccount,
+    username: settings.sfUsername,
+    database: settings.sfDatabase,
+    warehouse: settings.sfIncrementalWarehouse,
+    role: settings.sfRole,
+    parentLog: ctx.log,
+  })
+  ghIncremental = new GithubSnowflakeClient(sfIncremental)
+}
+
+const getClient = (
+  ctx: IProcessStreamContext,
+): { sf: SnowflakeClient; gh: GithubSnowflakeClient } => {
+  if (ctx.onboarding) {
+    if (!sf) {
+      initClient(ctx)
+    }
+    return { sf, gh }
+  } else {
+    if (!sfIncremental) {
+      initIncrementalClient(ctx)
+    }
+    return { sf: sfIncremental, gh: ghIncremental }
+  }
+}
+
+const prepareMember = (data: IBasicResponse): GithubPrepareMemberOutput => {
+  const isBot = data.actorLogin.endsWith('[bot]')
+  return {
+    memberFromApi: {
+      id: data.actorId.toString(),
+      login: data.actorLogin,
+      avatarUrl: data.actorAvatarUrl,
+      ...(isBot ? { isBot: true } : {}),
+    },
+    org: {
+      id: data.orgId?.toString(),
+      login: data.orgLogin,
+      avatarUrl: data.orgAvatarUrl,
+    },
+    email: '',
+  }
+}
+
+const publishNextPageStream = async (ctx: IProcessStreamContext, response: IGetResponse) => {
+  const data = ctx.stream.data as GithubBasicStream
+  // the last part of stream identifier is page number (e.g commits:12345:1)
+  const streamIdentifier = ctx.stream.identifier.split(':').slice(0, -1).join(':')
+  if (response.hasNextPage) {
+    await ctx.publishStream<GithubBasicStream>(`${streamIdentifier}:${response.nextPage}`, {
+      repo: data.repo,
+      sf_repo_id: data.sf_repo_id,
+      page: response.nextPage,
+    })
+    return true
+  }
+  return false
+}
+
+const processStargazersStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const since_days_ago = ctx.onboarding ? undefined : '2'
+
+  const result = await gh.getRepoStargazers({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+    since_days_ago,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    // publish data
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.STAR,
+      data: record,
+      member,
+      repo: data.repo,
+    })
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processForksStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const since_days_ago = ctx.onboarding ? undefined : '2'
+
+  const result = await gh.getRepoForks({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+    since_days_ago,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    // publish data
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.FORK,
+      data: record,
+      member,
+      repo: data.repo,
+    })
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processPullsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const since_days_ago = ctx.onboarding ? undefined : '2'
+
+  const result = await gh.getRepoPullRequests({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+    since_days_ago,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+    const action = record.action
+
+    if (action === 'opened') {
+      await ctx.processData<GithubApiData>({
+        type: GithubActivityType.PULL_REQUEST_OPENED,
+        data: record,
+        member,
+        repo: data.repo,
+      })
+    } else if (action === 'closed') {
+      await ctx.processData<GithubApiData>({
+        type: GithubActivityType.PULL_REQUEST_CLOSED,
+        data: record,
+        member,
+        repo: data.repo,
+      })
+
+      // additionall check if this PR is merged
+      if (record.payload.pull_request.merged) {
+        await ctx.processData<GithubApiData>({
+          type: GithubActivityType.PULL_REQUEST_MERGED,
+          data: record,
+          member,
+          repo: data.repo,
+        })
+      }
+    } else {
+      ctx.log.debug(`Unsupported pull request action: ${action}`)
+    }
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processPullCommentsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const since_days_ago = ctx.onboarding ? undefined : '2'
+
+  const result = await gh.getRepoPullRequestReviewComments({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+    since_days_ago,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.PULL_REQUEST_COMMENT,
+      data: record,
+      member,
+      repo: data.repo,
+    })
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processIssuesStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const since_days_ago = ctx.onboarding ? undefined : '2'
+
+  const result = await gh.getRepoIssues({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+    since_days_ago,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    const action = record.action
+
+    if (action === 'opened') {
+      await ctx.processData<GithubApiData>({
+        type: GithubActivityType.ISSUE_OPENED,
+        data: record,
+        member,
+        repo: data.repo,
+      })
+    } else if (action === 'closed') {
+      await ctx.processData<GithubApiData>({
+        type: GithubActivityType.ISSUE_CLOSED,
+        data: record,
+        member,
+        repo: data.repo,
+      })
+    }
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processIssueCommentsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const since_days_ago = ctx.onboarding ? undefined : '2'
+
+  const result = await gh.getRepoIssueComments({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+    since_days_ago,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.ISSUE_COMMENT,
+      data: record,
+      member,
+      repo: data.repo,
+    })
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processPullCommitsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const result = await gh.getRepoPushes({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.AUTHORED_COMMIT,
+      data: record,
+      member,
+      repo: data.repo,
+    })
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processPullReviewsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const { gh } = getClient(ctx)
+
+  const result = await gh.getRepoPullRequestReviews({
+    sf_repo_id: data.sf_repo_id,
+    page: data.page,
+  })
+
+  for (const record of result.data) {
+    const member = prepareMember(record)
+
+    // ignore commented reviews with no body
+    if (record.payload.review.state === 'commented' && record.payload.review.body === null) {
+      continue
+    }
+
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.PULL_REQUEST_REVIEWED,
+      data: record,
+      member,
+      repo: data.repo,
+    })
+  }
+
+  await publishNextPageStream(ctx, result)
+}
+
+const processRootStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubRootStream
+  const repos = data.reposToCheck
+
+  if (ctx.onboarding) {
+    await capGithubArchive(ctx, repos)
+  }
+
+  const { gh } = getClient(ctx)
+
+  // now it's time to start streams
+  // derivative streams should be started later, otherwise conversations can't be created correctly
+  for (const repo of repos) {
+    const repoId = await gh.getRepoId({ repo: repo.url })
+    for (const endpoint of [
+      GithubStreamType.STARGAZERS,
+      GithubStreamType.FORKS,
+      GithubStreamType.PULLS,
+      GithubStreamType.ISSUES,
+      GithubStreamType.PULL_COMMITS,
+      GithubStreamType.PULL_REVIEWS,
+      GithubStreamType.PULL_COMMENTS,
+      GithubStreamType.ISSUE_COMMENTS,
+    ]) {
+      // this firstPage thing is important to avoid duplicate streams and for handleNextPageStream to work
+      await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
+        repo,
+        sf_repo_id: repoId,
+        page: 1,
+      })
+    }
+  }
+}
+
+const handler: ProcessStreamHandler = async (ctx) => {
+  const streamIdentifier = ctx.stream.identifier
+
+  if (streamIdentifier.startsWith(GithubStreamType.ROOT)) {
+    await processRootStream(ctx)
+  } else {
+    const streamType = streamIdentifier.split(':')[0]
+
+    switch (streamType) {
+      case GithubStreamType.STARGAZERS:
+        await processStargazersStream(ctx)
+        break
+      case GithubStreamType.FORKS:
+        await processForksStream(ctx)
+        break
+      case GithubStreamType.PULLS:
+        await processPullsStream(ctx)
+        break
+      case GithubStreamType.PULL_COMMENTS:
+        await processPullCommentsStream(ctx)
+        break
+      case GithubStreamType.PULL_COMMITS:
+        await processPullCommitsStream(ctx)
+        break
+      case GithubStreamType.PULL_REVIEWS:
+        await processPullReviewsStream(ctx)
+        break
+      case GithubStreamType.ISSUES:
+        await processIssuesStream(ctx)
+        break
+      case GithubStreamType.ISSUE_COMMENTS:
+        await processIssueCommentsStream(ctx)
+        break
+      default:
+        ctx.log.error(`No matching process function for streamType: ${streamType}`)
+    }
+  }
+}
+
+export default handler
diff --git a/services/libs/integrations/src/integrations/github-snowflake/processWebhookStream.ts b/services/libs/integrations/src/integrations/github-snowflake/processWebhookStream.ts
new file mode 100644
index 0000000000..6a5bb0efa2
--- /dev/null
+++ b/services/libs/integrations/src/integrations/github-snowflake/processWebhookStream.ts
@@ -0,0 +1,8 @@
+import { ProcessWebhookStreamHandler } from '../../types'
+import { default as oldHandler } from '../github/processWebhookStream'
+
+const handler: ProcessWebhookStreamHandler = async (ctx) => {
+  await oldHandler(ctx)
+}
+
+export default handler
diff --git a/services/libs/integrations/src/integrations/github-old/types.ts b/services/libs/integrations/src/integrations/github-snowflake/types.ts
similarity index 74%
rename from services/libs/integrations/src/integrations/github-old/types.ts
rename to services/libs/integrations/src/integrations/github-snowflake/types.ts
index 7177870eb4..9df0b3b5ef 100644
--- a/services/libs/integrations/src/integrations/github-old/types.ts
+++ b/services/libs/integrations/src/integrations/github-snowflake/types.ts
@@ -1,21 +1,18 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 export enum GithubActivityType {
-  DISCUSSION_STARTED = 'discussion-started',
   PULL_REQUEST_OPENED = 'pull_request-opened',
   PULL_REQUEST_CLOSED = 'pull_request-closed',
-  PULL_REQUEST_REVIEW_REQUESTED = 'pull_request-review-requested',
+  // PULL_REQUEST_REVIEW_REQUESTED = 'pull_request-review-requested',
   PULL_REQUEST_REVIEWED = 'pull_request-reviewed',
-  PULL_REQUEST_ASSIGNED = 'pull_request-assigned',
+  // PULL_REQUEST_ASSIGNED = 'pull_request-assigned',
   PULL_REQUEST_MERGED = 'pull_request-merged',
   ISSUE_OPENED = 'issues-opened',
   ISSUE_CLOSED = 'issues-closed',
   FORK = 'fork',
   STAR = 'star',
-  UNSTAR = 'unstar',
   PULL_REQUEST_COMMENT = 'pull_request-comment',
-  PULL_REQUEST_REVIEW_THREAD_COMMENT = 'pull_request-review-thread-comment',
+  // PULL_REQUEST_REVIEW_THREAD_COMMENT = 'pull_request-review-thread-comment',
   ISSUE_COMMENT = 'issue-comment',
-  DISCUSSION_COMMENT = 'discussion-comment',
   AUTHORED_COMMIT = 'authored-commit',
 }
 
@@ -82,32 +79,16 @@ export enum GithubWebhookSubType {
   DISCUSSION_COMMENT_REPLY = 'discussion-comment-reply',
 }
 
-export enum GithubWehookEvent {
-  ISSUES = 'issues',
-  DISCUSSION = 'discussion',
-  PULL_REQUEST = 'pull_request',
-  PULL_REQUEST_REVIEW = 'pull_request_review',
-  STAR = 'star',
-  FORK = 'fork',
-  DISCUSSION_COMMENT = 'discussion_comment',
-  PULL_REQUEST_REVIEW_COMMENT = 'pull_request_review_comment',
-  ISSUE_COMMENT = 'issue_comment',
-  PULL_REQUEST_COMMENT = 'pull_request_comment',
-}
-
 export enum GithubStreamType {
   ROOT = 'root',
   STARGAZERS = 'stargazers',
   FORKS = 'forks',
   PULLS = 'pulls',
   PULL_COMMENTS = 'pull-comments',
-  PULL_REVIEW_THREADS = 'pull-review-threads',
-  PULL_REVIEW_THREAD_COMMENTS = 'pull-review-thread-comments',
   PULL_COMMITS = 'pull-commits',
+  PULL_REVIEWS = 'pull-reviews',
   ISSUES = 'issues',
   ISSUE_COMMENTS = 'issue-comments',
-  DISCUSSIONS = 'discussions',
-  DISCUSSION_COMMENTS = 'discussion-comments',
 }
 
 export enum GithubManualStreamType {
@@ -116,7 +97,6 @@ export enum GithubManualStreamType {
   FORKS = 'forks',
   PULLS = 'pulls',
   ISSUES = 'issues',
-  DISCUSSIONS = 'discussions',
 }
 
 export const INDIRECT_FORK = 'indirect-fork'
@@ -131,19 +111,6 @@ export interface GithubApiData {
   objectMember?: GithubPrepareMemberOutput
   sourceParentId?: string
   repo: Repo
-  isOld: boolean
-}
-
-export interface GithubWebhookData {
-  webhookType: GithubWehookEvent
-  subType?: string
-  data: any[] | any
-  relatedData?: any | any[]
-  member?: GithubPrepareMemberOutput
-  orgMember?: GithubPrepareOrgMemberOutput
-  objectMember?: GithubPrepareMemberOutput
-  sourceParentId?: string
-  date?: string
 }
 
 export interface GithubRootStream {
@@ -152,7 +119,8 @@ export interface GithubRootStream {
 
 export interface GithubBasicStream {
   repo: Repo
-  page: string
+  sf_repo_id: string
+  page: number
   prNumber?: string
   reviewThreadId?: string
   issueNumber?: string
@@ -160,6 +128,13 @@ export interface GithubBasicStream {
 }
 
 export interface GithubPlatformSettings {
+  sfPrivateKey: string
+  sfAccount: string
+  sfUsername: string
+  sfDatabase: string
+  sfWarehouse: string
+  sfIncrementalWarehouse: string
+  sfRole: string
   appId: string
   clientId: string
   clientSecret: string
@@ -169,11 +144,19 @@ export interface GithubPlatformSettings {
   globalLimit?: number
   callbackUrl: string
   personalAccessTokens: string
+  tgNotifierToken: string
+  tgNotifierChatId: string
 }
 
 export interface GithubIntegrationSettings {
-  repos: Repos
-  unavailableRepos: Repos
+  orgs: Array<{
+    name: string
+    logo: string
+    url: string
+    fullSync: boolean
+    updatedAt: string
+    repos: Array<Repo>
+  }>
 }
 
 export interface GitHubManualIntegrationSettingsDefault extends GithubIntegrationSettings {
@@ -199,14 +182,9 @@ export enum GithubPullRequestEvents {
 }
 
 export type Repo = {
-  url: string
   name: string
-  createdAt: string
-  owner: string
-  available?: boolean
-  fork?: boolean
-  private?: boolean
-  cloneUrl?: string
+  url: string
+  updatedAt: string
 }
 
 export type Repos = Array<Repo>
@@ -228,8 +206,26 @@ export interface AppTokenResponse {
 
 export interface GithubPrepareMemberOutput {
   email: string
-  orgs: any
-  memberFromApi: any
+  org: {
+    id: string
+    login: string
+    avatarUrl: string
+  }
+  memberFromApi: {
+    id: string
+    login: string
+    avatarUrl: string
+    isBot?: boolean
+    isDeleted?: boolean
+    name?: string
+    bio?: string
+    location?: string
+    company?: string
+    url?: string
+    isHireable?: boolean
+    twitterUsername?: string
+    websiteUrl?: string
+  }
 }
 
 export interface GithubBotMember {
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/baseQuery.ts b/services/libs/integrations/src/integrations/github/api/graphql/baseQuery.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/baseQuery.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/baseQuery.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/discussionComments.ts b/services/libs/integrations/src/integrations/github/api/graphql/discussionComments.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/discussionComments.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/discussionComments.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/discussions.ts b/services/libs/integrations/src/integrations/github/api/graphql/discussions.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/discussions.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/discussions.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/forks.ts b/services/libs/integrations/src/integrations/github/api/graphql/forks.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/forks.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/forks.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/issueComments.ts b/services/libs/integrations/src/integrations/github/api/graphql/issueComments.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/issueComments.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/issueComments.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/issues.ts b/services/libs/integrations/src/integrations/github/api/graphql/issues.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/issues.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/issues.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/members.ts b/services/libs/integrations/src/integrations/github/api/graphql/members.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/members.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/members.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/organizations.ts b/services/libs/integrations/src/integrations/github/api/graphql/organizations.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/organizations.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/organizations.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestComments.ts b/services/libs/integrations/src/integrations/github/api/graphql/pullRequestComments.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestComments.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/pullRequestComments.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestCommits.ts b/services/libs/integrations/src/integrations/github/api/graphql/pullRequestCommits.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestCommits.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/pullRequestCommits.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestCommitsNoAdditions.ts b/services/libs/integrations/src/integrations/github/api/graphql/pullRequestCommitsNoAdditions.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestCommitsNoAdditions.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/pullRequestCommitsNoAdditions.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestReviewThreadComments.ts b/services/libs/integrations/src/integrations/github/api/graphql/pullRequestReviewThreadComments.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestReviewThreadComments.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/pullRequestReviewThreadComments.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestReviewThreads.ts b/services/libs/integrations/src/integrations/github/api/graphql/pullRequestReviewThreads.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/pullRequestReviewThreads.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/pullRequestReviewThreads.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/pullRequests.ts b/services/libs/integrations/src/integrations/github/api/graphql/pullRequests.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/pullRequests.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/pullRequests.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/stargazers.ts b/services/libs/integrations/src/integrations/github/api/graphql/stargazers.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/stargazers.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/stargazers.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/teams.ts b/services/libs/integrations/src/integrations/github/api/graphql/teams.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/teams.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/teams.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/graphql/types.ts b/services/libs/integrations/src/integrations/github/api/graphql/types.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/graphql/types.ts
rename to services/libs/integrations/src/integrations/github/api/graphql/types.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/rest/getAppToken.ts b/services/libs/integrations/src/integrations/github/api/rest/getAppToken.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/rest/getAppToken.ts
rename to services/libs/integrations/src/integrations/github/api/rest/getAppToken.ts
diff --git a/services/libs/integrations/src/integrations/github-old/api/rest/getInstalledRepositories.ts b/services/libs/integrations/src/integrations/github/api/rest/getInstalledRepositories.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/api/rest/getInstalledRepositories.ts
rename to services/libs/integrations/src/integrations/github/api/rest/getInstalledRepositories.ts
diff --git a/services/libs/integrations/src/integrations/github/generateStreams.ts b/services/libs/integrations/src/integrations/github/generateStreams.ts
index 2b0455c9bb..f432a6e0a7 100644
--- a/services/libs/integrations/src/integrations/github/generateStreams.ts
+++ b/services/libs/integrations/src/integrations/github/generateStreams.ts
@@ -1,40 +1,100 @@
 import { GenerateStreamsHandler } from '../../types'
 
-import { GithubIntegrationSettings, GithubRootStream, GithubStreamType, Repo } from './types'
+import {
+  GithubBasicStream,
+  GithubIntegrationSettings,
+  GithubManualIntegrationSettings,
+  GithubManualStreamType,
+  GithubRootStream,
+  GithubStreamType,
+} from './types'
 
-const NEW_REPO_THRESHOLD_MS = 20000 // 20 seconds in milliseconds
+const streamToManualStreamMap: Map<GithubStreamType, GithubManualStreamType> = new Map([
+  [GithubStreamType.STARGAZERS, GithubManualStreamType.STARGAZERS],
+  [GithubStreamType.FORKS, GithubManualStreamType.FORKS],
+  [GithubStreamType.PULLS, GithubManualStreamType.PULLS],
+  [GithubStreamType.ISSUES, GithubManualStreamType.ISSUES],
+  [GithubStreamType.DISCUSSIONS, GithubManualStreamType.DISCUSSIONS],
+])
 
-interface AdditionalInfo {
-  messageSentAt: string
-}
-
-const isRepoRecentlyUpdated = (repo: Repo, messageSentAt?: Date): boolean => {
-  if (!repo.updatedAt) return true // If no updatedAt, process it to be safe
+const manualStreamToStreamMap: Map<GithubManualStreamType, GithubStreamType> = new Map([
+  [GithubManualStreamType.STARGAZERS, GithubStreamType.STARGAZERS],
+  [GithubManualStreamType.FORKS, GithubStreamType.FORKS],
+  [GithubManualStreamType.PULLS, GithubStreamType.PULLS],
+  [GithubManualStreamType.ISSUES, GithubStreamType.ISSUES],
+  [GithubManualStreamType.DISCUSSIONS, GithubStreamType.DISCUSSIONS],
+])
 
-  if (messageSentAt) {
-    // For newly added repos, check if they were updated within 20 seconds of the message
-    const repoUpdateTime = new Date(repo.updatedAt).getTime()
-    const messageTime = messageSentAt.getTime()
-    return Math.abs(repoUpdateTime - messageTime) < NEW_REPO_THRESHOLD_MS
+const objectToMap = (obj: object): Map<string, Array<GithubManualStreamType>> => {
+  const map = new Map<string, Array<GithubManualStreamType>>()
+  for (const [key, value] of Object.entries(obj)) {
+    map.set(key, value)
   }
-
-  return true
+  return map
 }
 
 const handler: GenerateStreamsHandler = async (ctx) => {
-  const messageSentAt = (ctx.additionalInfo as AdditionalInfo)?.messageSentAt
-    ? new Date((ctx.additionalInfo as AdditionalInfo).messageSentAt)
-    : undefined
   const settings = ctx.integration.settings as GithubIntegrationSettings
-  const reposToCheck = ctx.onboarding
-    ? settings.orgs
-        .flatMap((org) => org.repos)
-        .filter((repo) => isRepoRecentlyUpdated(repo, messageSentAt))
-    : // for onboarding runs, we only check recently added repos. This needed when integration updated
-      settings.orgs.flatMap((org) => org.repos) // for non-onboarding runs, we check all repos
+  let reposToCheck = [
+    ...(settings?.orgs?.flatMap((o) => o.repos) || []),
+    ...(settings?.unavailableRepos || []),
+  ]
+
+  // repos from settings have only url and name, we need to get owner from url
+  reposToCheck = reposToCheck.map((repo) => {
+    const url = new URL(repo.url)
+    return { ...repo, owner: url.pathname.split('/')[1] }
+  })
 
-  ctx.log.info(`${messageSentAt ? messageSentAt.toISOString() : 'Checking all repos'}`)
+  const isManualRun = ctx.isManualRun
+
+  if (isManualRun) {
+    const manualSettings = ctx.manualSettings as GithubManualIntegrationSettings
+    if (!manualSettings) {
+      ctx.abortRunWithError('isManualRun is true but manualSettings is not set!')
+    }
+
+    if (manualSettings.orgs && manualSettings.manualSettingsType === 'default') {
+      for (const repo of manualSettings.orgs.flatMap((o) => o.repos)) {
+        for (const endpoint of [
+          GithubStreamType.STARGAZERS,
+          GithubStreamType.FORKS,
+          GithubStreamType.PULLS,
+          GithubStreamType.ISSUES,
+          GithubStreamType.DISCUSSIONS,
+        ]) {
+          if (
+            manualSettings.streamType === GithubManualStreamType.ALL ||
+            manualSettings.streamType === streamToManualStreamMap.get(endpoint)
+          ) {
+            await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
+              repo: { ...repo, owner: new URL(repo.url).pathname.split('/')[1] },
+              page: '',
+            })
+          }
+        }
+      }
+    } else if (manualSettings.orgs && manualSettings.manualSettingsType === 'detailed_map') {
+      const map = objectToMap(manualSettings.map)
+      for (const [repoUrl, streams] of map) {
+        for (const stream of streams) {
+          const endpoint = manualStreamToStreamMap.get(stream)
+          if (!endpoint) {
+            ctx.abortRunWithError(`Invalid stream type: ${stream}`)
+          }
+          const repo = manualSettings.orgs.flatMap((o) => o.repos).find((r) => r.url === repoUrl)
+          await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
+            repo: { ...repo, owner: new URL(repo.url).pathname.split('/')[1] },
+            page: '',
+          })
+        }
+      }
+    }
+
+    return
+  }
 
+  // not manual run, executing normal run
   await ctx.publishStream<GithubRootStream>(GithubStreamType.ROOT, {
     reposToCheck,
   })
diff --git a/services/libs/integrations/src/integrations/github/grid.ts b/services/libs/integrations/src/integrations/github/grid.ts
index 935d7394d3..8bc78e95b5 100644
--- a/services/libs/integrations/src/integrations/github/grid.ts
+++ b/services/libs/integrations/src/integrations/github/grid.ts
@@ -3,6 +3,14 @@ import { IActivityScoringGrid } from '@crowd/types'
 import { GithubActivityType } from './types'
 
 export const GITHUB_GRID: Record<GithubActivityType, IActivityScoringGrid> = {
+  [GithubActivityType.DISCUSSION_STARTED]: {
+    score: 8,
+    isContribution: true,
+  },
+  [GithubActivityType.DISCUSSION_COMMENT]: {
+    score: 6,
+    isContribution: true,
+  },
   [GithubActivityType.FORK]: {
     score: 4,
     isContribution: false,
@@ -35,14 +43,30 @@ export const GITHUB_GRID: Record<GithubActivityType, IActivityScoringGrid> = {
     score: 2,
     isContribution: false,
   },
+  [GithubActivityType.UNSTAR]: {
+    score: -2,
+    isContribution: false,
+  },
   [GithubActivityType.PULL_REQUEST_MERGED]: {
     score: 6,
     isContribution: true,
   },
+  [GithubActivityType.PULL_REQUEST_ASSIGNED]: {
+    score: 2,
+    isContribution: false,
+  },
   [GithubActivityType.PULL_REQUEST_REVIEWED]: {
     score: 8,
     isContribution: true,
   },
+  [GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED]: {
+    score: 2,
+    isContribution: false,
+  },
+  [GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT]: {
+    score: 6,
+    isContribution: true,
+  },
   [GithubActivityType.AUTHORED_COMMIT]: {
     score: 2,
     isContribution: true,
diff --git a/services/libs/integrations/src/integrations/github/index.ts b/services/libs/integrations/src/integrations/github/index.ts
index 6e978f0125..7b028eefda 100644
--- a/services/libs/integrations/src/integrations/github/index.ts
+++ b/services/libs/integrations/src/integrations/github/index.ts
@@ -12,11 +12,10 @@ import processWebhookStream from './processWebhookStream'
 const descriptor: IIntegrationDescriptor = {
   type: PlatformType.GITHUB,
   memberAttributes: GITHUB_MEMBER_ATTRIBUTES,
-  checkEvery: 24 * 60, // 24 hours
   generateStreams,
   processStream,
-  processData,
   processWebhookStream,
+  processData,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   postProcess: (settings: any) => {
     return settings
diff --git a/services/libs/integrations/src/integrations/github/memberAttributes.ts b/services/libs/integrations/src/integrations/github/memberAttributes.ts
index ea05cb7d1e..8ad671c37e 100644
--- a/services/libs/integrations/src/integrations/github/memberAttributes.ts
+++ b/services/libs/integrations/src/integrations/github/memberAttributes.ts
@@ -55,11 +55,4 @@ export const GITHUB_MEMBER_ATTRIBUTES: IMemberAttribute[] = [
     canDelete: false,
     show: true,
   },
-  {
-    name: MemberAttributes[MemberAttributeName.IS_BOT].name,
-    label: MemberAttributes[MemberAttributeName.IS_BOT].label,
-    type: MemberAttributeType.BOOLEAN,
-    canDelete: false,
-    show: true,
-  },
 ]
diff --git a/services/libs/integrations/src/integrations/github/processData.ts b/services/libs/integrations/src/integrations/github/processData.ts
index 96f746f300..092471a3e0 100644
--- a/services/libs/integrations/src/integrations/github/processData.ts
+++ b/services/libs/integrations/src/integrations/github/processData.ts
@@ -1,18 +1,9 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 // processStream.ts content
 // processData.ts content
-import {
-  type IGetRepoForksResult,
-  type IGetRepoIssueCommentsResult,
-  type IGetRepoIssuesResult,
-  type IGetRepoPullRequestReviewCommentsResult,
-  type IGetRepoPullRequestReviewsResult,
-  type IGetRepoPullRequestsResult,
-  type IGetRepoPushesResult,
-  type IGetRepoStargazersResult,
-} from '@crowd/snowflake'
 import {
   IActivityData,
+  IActivityScoringGrid,
   IMemberData,
   IOrganization,
   MemberAttributeName,
@@ -23,11 +14,23 @@ import {
 } from '@crowd/types'
 
 import { generateSourceIdHash } from '../../helpers'
-import { ProcessDataHandler } from '../../types'
-import { default as oldHandler } from '../github-old/processData'
+import { IProcessDataContext, ProcessDataHandler } from '../../types'
 
 import { GITHUB_GRID } from './grid'
-import { GithubActivityType, GithubApiData, GithubPrepareMemberOutput } from './types'
+import {
+  GithubActivitySubType,
+  GithubActivityType,
+  GithubApiData,
+  GithubIssue,
+  GithubIssueTimelineItem,
+  GithubPrepareMemberOutput,
+  GithubPrepareOrgMemberOutput,
+  GithubPullRequest,
+  GithubPullRequestTimelineItem,
+  GithubWebhookData,
+  GithubWehookEvent,
+  INDIRECT_FORK,
+} from './types'
 
 const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
 
@@ -89,11 +92,8 @@ const parseDeletedMember = (memberData: GithubPrepareMemberOutput): IMemberData
   return member
 }
 
-const parseMember = (
-  memberData: GithubPrepareMemberOutput,
-  additionalEmails?: string[],
-): IMemberData => {
-  const { email, org, memberFromApi } = memberData
+const parseMember = (memberData: GithubPrepareMemberOutput): IMemberData => {
+  const { email, orgs, memberFromApi } = memberData
 
   if (memberFromApi.isBot && memberFromApi.isDeleted) {
     throw new Error('Member cannot be both bot and deleted')
@@ -149,19 +149,6 @@ const parseMember = (
     })
   }
 
-  if (additionalEmails) {
-    additionalEmails
-      .filter((email) => email.trim() && email.includes('@'))
-      .forEach((email) => {
-        member.identities.push({
-          platform: PlatformType.GITHUB,
-          value: email,
-          type: MemberIdentityType.EMAIL,
-          verified: true,
-        })
-      })
-  }
-
   if (memberFromApi?.twitterUsername) {
     member.identities.push({
       platform: PlatformType.TWITTER,
@@ -200,19 +187,40 @@ const parseMember = (
     } else {
       const company = memberFromApi.company.replace('@', '').trim()
 
-      if (org && company.length > 0) {
-        const organizationPayload: IOrganization = {
-          displayName: org.login,
+      if (orgs && company.length > 0) {
+        const organizationPayload = {
+          displayName: orgs.name,
+          names: [orgs.name],
           identities: [
             {
               platform: PlatformType.GITHUB,
               type: OrganizationIdentityType.USERNAME,
-              value: org.login,
+              value: orgs.url.replace('https://github.com/', ''),
               verified: true,
             },
           ],
-          logo: org.avatarUrl ?? null,
+          description: orgs.description ?? null,
+          location: orgs.location ?? null,
+          logo: orgs.avatarUrl ?? null,
           source: OrganizationSource.GITHUB,
+        } as IOrganization
+
+        if (orgs.websiteUrl) {
+          organizationPayload.identities.push({
+            platform: PlatformType.GITHUB,
+            type: OrganizationIdentityType.PRIMARY_DOMAIN,
+            value: orgs.websiteUrl,
+            verified: false,
+          })
+        }
+
+        if (orgs.twitterUsername) {
+          organizationPayload.identities.push({
+            platform: PlatformType.TWITTER,
+            type: OrganizationIdentityType.USERNAME,
+            value: orgs.twitterUsername,
+            verified: false,
+          })
         }
 
         member.organizations = [organizationPayload]
@@ -220,12 +228,77 @@ const parseMember = (
     }
   }
 
+  // if (memberFromApi.followers && memberFromApi.followers.totalCount > 0) {
+  //   member.reach = { [PlatformType.GITHUB]: memberFromApi.followers.totalCount }
+  // }
+
+  return member
+}
+
+const parseOrgMember = (memberData: GithubPrepareOrgMemberOutput): IMemberData => {
+  const { orgFromApi } = memberData
+
+  const member: IMemberData = {
+    identities: [
+      {
+        platform: PlatformType.GITHUB,
+        value: orgFromApi.login,
+        type: MemberIdentityType.USERNAME,
+        verified: true,
+      },
+    ],
+    displayName: orgFromApi?.name?.trim() || orgFromApi.login,
+    attributes: {
+      [MemberAttributeName.URL]: {
+        [PlatformType.GITHUB]: orgFromApi.url,
+      },
+      [MemberAttributeName.BIO]: {
+        [PlatformType.GITHUB]: orgFromApi.description || '',
+      },
+      [MemberAttributeName.LOCATION]: {
+        [PlatformType.GITHUB]: orgFromApi.location || '',
+      },
+      [MemberAttributeName.AVATAR_URL]: {
+        [PlatformType.GITHUB]: orgFromApi.avatarUrl || '',
+      },
+    },
+  }
+
+  if (orgFromApi.email) {
+    member.identities.push({
+      platform: PlatformType.GITHUB,
+      value: orgFromApi.email,
+      type: MemberIdentityType.EMAIL,
+      verified: true,
+    })
+  }
+
+  if (orgFromApi?.twitterUsername) {
+    member.identities.push({
+      platform: PlatformType.TWITTER,
+      value: orgFromApi.twitterUsername,
+      type: MemberIdentityType.USERNAME,
+      verified: false,
+    })
+  }
+
+  if (orgFromApi.websiteUrl) {
+    member.attributes[MemberAttributeName.WEBSITE_URL] = {
+      [PlatformType.GITHUB]: orgFromApi.websiteUrl,
+    }
+  }
+
+  // mark as organization
+  member.attributes[MemberAttributeName.IS_ORGANIZATION] = {
+    [PlatformType.GITHUB]: true,
+  }
+
   return member
 }
 
 const parseStar: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoStargazersResult
+  const data = apiData.data
   const memberData = apiData.member
 
   const member = parseMember(memberData)
@@ -233,13 +306,13 @@ const parseStar: ProcessDataHandler = async (ctx) => {
   const activity: IActivityData = {
     type: GithubActivityType.STAR,
     sourceId: generateSourceIdHash(
-      data.actorLogin,
+      data.node.login,
       GithubActivityType.STAR,
-      Math.floor(new Date(data.timestamp).getTime() / 1000).toString(),
+      Math.floor(new Date(data.starredAt).getTime() / 1000).toString(),
       PlatformType.GITHUB,
     ),
     sourceParentId: '',
-    timestamp: new Date(data.timestamp).toISOString(),
+    timestamp: new Date(data.starredAt).toISOString(),
     channel: apiData.repo.url,
     member,
     score: GITHUB_GRID.star.score,
@@ -252,47 +325,47 @@ const parseStar: ProcessDataHandler = async (ctx) => {
 const parseFork: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
 
-  // if (apiData.orgMember && !apiData.member) {
-  //   await parseForkByOrg(ctx)
-  //   return
-  // } else if (apiData.member && apiData.orgMember) {
-  //   throw new Error('Both member and orgMember are present')
-  // } else if (!apiData.member && !apiData.orgMember) {
-  //   throw new Error('Both member and orgMember are missing')
-  // }
+  if (apiData.orgMember && !apiData.member) {
+    await parseForkByOrg(ctx)
+    return
+  } else if (apiData.member && apiData.orgMember) {
+    throw new Error('Both member and orgMember are present')
+  } else if (!apiData.member && !apiData.orgMember) {
+    throw new Error('Both member and orgMember are missing')
+  }
 
-  const data = apiData.data as IGetRepoForksResult
-  // const relatedData = apiData.relatedData
+  const data = apiData.data
+  const relatedData = apiData.relatedData
   const memberData = apiData.member
-  // const subType = apiData.subType
+  const subType = apiData.subType
 
   const member = parseMember(memberData)
 
-  // if (subType && subType === INDIRECT_FORK) {
-  //   const activity: IActivityData = {
-  //     type: GithubActivityType.FORK,
-  //     sourceId: data.id,
-  //     sourceParentId: '',
-  //     timestamp: new Date(data.createdAt).toISOString(),
-  //     channel: apiData.repo.url,
-  //     member,
-  //     score: GITHUB_GRID.fork.score,
-  //     isContribution: GITHUB_GRID.fork.isContribution,
-  //     attributes: {
-  //       isIndirectFork: true,
-  //       directParent: relatedData.url,
-  //     },
-  //   }
-
-  //   await ctx.publishActivity(activity)
-  //   return
-  // }
+  if (subType && subType === INDIRECT_FORK) {
+    const activity: IActivityData = {
+      type: GithubActivityType.FORK,
+      sourceId: data.id,
+      sourceParentId: '',
+      timestamp: new Date(data.createdAt).toISOString(),
+      channel: apiData.repo.url,
+      member,
+      score: GITHUB_GRID.fork.score,
+      isContribution: GITHUB_GRID.fork.isContribution,
+      attributes: {
+        isIndirectFork: true,
+        directParent: relatedData.url,
+      },
+    }
+
+    await ctx.publishActivity(activity)
+    return
+  }
 
   const activity: IActivityData = {
     type: GithubActivityType.FORK,
-    sourceId: data.payload.forkee.node_id,
+    sourceId: data.id,
     sourceParentId: '',
-    timestamp: new Date(data.timestamp).toISOString(),
+    timestamp: new Date(data.createdAt).toISOString(),
     channel: apiData.repo.url,
     member,
     score: GITHUB_GRID.fork.score,
@@ -302,30 +375,76 @@ const parseFork: ProcessDataHandler = async (ctx) => {
   await ctx.publishActivity(activity)
 }
 
+const parseForkByOrg: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data
+  const relatedData = apiData.relatedData
+  const memberData = apiData.orgMember
+  const subType = apiData.subType
+
+  const member = parseOrgMember(memberData)
+
+  if (subType && subType === INDIRECT_FORK) {
+    const activity: IActivityData = {
+      type: GithubActivityType.FORK,
+      sourceId: data.id,
+      sourceParentId: '',
+      timestamp: new Date(data.createdAt).toISOString(),
+      channel: apiData.repo.url,
+      member,
+      score: GITHUB_GRID.fork.score,
+      isContribution: GITHUB_GRID.fork.isContribution,
+      attributes: {
+        isIndirectFork: true,
+        directParent: relatedData.url,
+        isForkByOrg: true,
+      },
+    }
+
+    await ctx.publishActivity(activity)
+    return
+  }
+
+  const activity: IActivityData = {
+    type: GithubActivityType.FORK,
+    sourceId: data.id,
+    sourceParentId: '',
+    timestamp: new Date(data.createdAt).toISOString(),
+    channel: apiData.repo.url,
+    member,
+    score: GITHUB_GRID.fork.score,
+    isContribution: GITHUB_GRID.fork.isContribution,
+    attributes: {
+      isForkByOrg: true,
+    },
+  }
+
+  await ctx.publishActivity(activity)
+}
+
 const parsePullRequestOpened: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoPullRequestsResult
+  const data = apiData.data as GithubPullRequest
   const memberData = apiData.member
 
   const member = parseMember(memberData)
 
   const activity: IActivityData = {
     type: GithubActivityType.PULL_REQUEST_OPENED,
-    sourceId: data.payload.pull_request.node_id,
+    sourceId: data.id,
     sourceParentId: '',
-    timestamp: new Date(data.timestamp).toISOString(),
-    body: data.payload.pull_request.body,
-    url: data.payload.pull_request._links.html.href,
+    timestamp: new Date(data.createdAt).toISOString(),
+    body: data.bodyText,
+    url: data.url ? data.url : '',
     channel: apiData.repo.url,
-    title: data.payload.pull_request.title,
+    title: data.title,
     attributes: {
-      state: data.payload.pull_request.state.toLowerCase(),
-      additions: data.payload.pull_request.additions,
-      deletions: data.payload.pull_request.deletions,
-      changedFiles: data.payload.pull_request.changed_files,
-      authorAssociation: data.payload.pull_request.author_association,
-      labels: data.payload.pull_request.labels?.map((l) => (l as any)?.name),
-      sha: data.payload.pull_request.head.sha,
+      state: data.state.toLowerCase(),
+      additions: data.additions,
+      deletions: data.deletions,
+      changedFiles: data.changedFiles,
+      authorAssociation: data.authorAssociation,
+      labels: data.labels?.nodes.map((l) => l.name),
     },
     member,
     score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED].score,
@@ -337,7 +456,8 @@ const parsePullRequestOpened: ProcessDataHandler = async (ctx) => {
 
 const parsePullRequestClosed: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoPullRequestsResult
+  const data = apiData.data as GithubPullRequestTimelineItem
+  const relatedData = apiData.relatedData as GithubPullRequest
   const memberData = apiData.member
   const repo = apiData.repo
 
@@ -345,22 +465,22 @@ const parsePullRequestClosed: ProcessDataHandler = async (ctx) => {
 
   const activity: IActivityData = {
     type: GithubActivityType.PULL_REQUEST_CLOSED,
-    sourceId: `gen-CE_${data.payload.pull_request.node_id}_${memberData.memberFromApi.login}_${new Date(
-      data.timestamp,
+    sourceId: `gen-CE_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
+      data.createdAt,
     ).toISOString()}`,
-    sourceParentId: data.payload.pull_request.node_id,
-    timestamp: new Date(data.timestamp).toISOString(),
+    sourceParentId: relatedData.id,
+    timestamp: new Date(data.createdAt).toISOString(),
     body: '',
-    url: data.payload.pull_request._links.html.href,
+    url: relatedData.url ? relatedData.url : '',
     channel: repo.url,
     title: '',
     attributes: {
-      state: data.payload.pull_request.state.toLowerCase(),
-      additions: data.payload.pull_request.additions,
-      deletions: data.payload.pull_request.deletions,
-      changedFiles: data.payload.pull_request.changed_files,
-      authorAssociation: data.payload.pull_request.author_association,
-      labels: data.payload.pull_request.labels?.map((l) => (l as any)?.name),
+      state: relatedData.state.toLowerCase(),
+      additions: relatedData.additions,
+      deletions: relatedData.deletions,
+      changedFiles: relatedData.changedFiles,
+      authorAssociation: relatedData.authorAssociation,
+      labels: relatedData.labels?.nodes.map((l) => l.name),
     },
     member,
     score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED].score,
@@ -370,29 +490,80 @@ const parsePullRequestClosed: ProcessDataHandler = async (ctx) => {
   await ctx.publishActivity(activity)
 }
 
+const parsePullRequestReviewRequested: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as GithubPullRequestTimelineItem
+  const relatedData = apiData.relatedData as GithubPullRequest
+  const memberData = apiData.member
+  const objectMemberData = apiData.objectMember
+
+  const member = parseMember(memberData)
+  const objectMember = parseMember(objectMemberData)
+
+  const subType = apiData.subType
+
+  const sourceId =
+    subType === GithubActivitySubType.PULL_REQUEST_REVIEW_REQUESTED_SINGLE
+      ? `gen-RRE_${relatedData.id}_${memberData.memberFromApi.login}_${
+          objectMemberData.memberFromApi.login
+        }_${new Date(data.createdAt).toISOString()}`
+      : `gen-RRE_${relatedData.id}_${memberData.memberFromApi.login}_${
+          objectMemberData.memberFromApi.login
+        }_${new Date(data.createdAt).toISOString()}`
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED,
+    sourceId: sourceId,
+    sourceParentId: relatedData.id,
+    timestamp: new Date(data.createdAt).toISOString(),
+    body: '',
+    url: relatedData.url,
+    channel: apiData.repo.url,
+    title: '',
+    attributes: {
+      state: relatedData.state.toLowerCase(),
+      additions: relatedData.additions,
+      deletions: relatedData.deletions,
+      changedFiles: relatedData.changedFiles,
+      authorAssociation: relatedData.authorAssociation,
+      labels: relatedData.labels?.nodes.map((l) => l.name),
+    },
+    member,
+    objectMember,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
 const parsePullRequestReviewed: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoPullRequestReviewsResult
+  const data = apiData.data as GithubPullRequestTimelineItem
+  const relatedData = apiData.relatedData as GithubPullRequest
   const memberData = apiData.member
 
   const member = parseMember(memberData)
 
   const activity: IActivityData = {
     type: GithubActivityType.PULL_REQUEST_REVIEWED,
-    sourceId: `gen-PRR_${data.payload.pull_request.node_id}_${memberData.memberFromApi.login}_${new Date(
-      data.timestamp,
+    sourceId: `gen-PRR_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
+      data.submittedAt,
     ).toISOString()}`,
-    sourceParentId: data.payload.pull_request.node_id,
-    timestamp: new Date(data.timestamp).toISOString(),
-    url: data.payload.pull_request._links.html.href,
+    sourceParentId: relatedData.id,
+    timestamp: new Date(data.submittedAt).toISOString(),
+    url: relatedData.url,
     channel: apiData.repo.url,
-    body: '',
+    body: data.body,
     title: '',
     attributes: {
       reviewState: data.state,
-      state: data.payload.pull_request.state.toLowerCase(),
-      authorAssociation: data.payload.pull_request.author_association,
-      labels: data.payload.pull_request.labels?.map((l) => (l as any)?.name),
+      state: relatedData.state.toLowerCase(),
+      additions: relatedData.additions,
+      deletions: relatedData.deletions,
+      changedFiles: relatedData.changedFiles,
+      authorAssociation: relatedData.authorAssociation,
+      labels: relatedData.labels,
     },
     member,
     score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED].score,
@@ -402,31 +573,70 @@ const parsePullRequestReviewed: ProcessDataHandler = async (ctx) => {
   await ctx.publishActivity(activity)
 }
 
+const parsePullRequestAssigned: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data as GithubPullRequestTimelineItem
+  const relatedData = apiData.relatedData as GithubPullRequest
+  const memberData = apiData.member
+  const objectMemberData = apiData.objectMember
+
+  const member = parseMember(memberData)
+  const objectMember = parseMember(objectMemberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_ASSIGNED,
+    sourceId: `gen-AE_${relatedData.id}_${memberData.memberFromApi.login}_${
+      objectMemberData.memberFromApi.login
+    }_${new Date(data.createdAt).toISOString()}`,
+    sourceParentId: relatedData.id,
+    timestamp: new Date(data.createdAt).toISOString(),
+    body: '',
+    url: relatedData.url,
+    channel: apiData.repo.url,
+    title: '',
+    attributes: {
+      state: relatedData.state.toLowerCase(),
+      additions: relatedData.additions,
+      deletions: relatedData.deletions,
+      changedFiles: relatedData.changedFiles,
+      authorAssociation: relatedData.authorAssociation,
+      labels: relatedData.labels?.nodes?.map((l) => l.name),
+    },
+    member,
+    objectMember,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_ASSIGNED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.PULL_REQUEST_ASSIGNED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
 const parsePullRequestMerged: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoPullRequestsResult
+  const data = apiData.data as GithubPullRequestTimelineItem
+  const relatedData = apiData.relatedData as GithubPullRequest
   const memberData = apiData.member
 
   const member = parseMember(memberData)
 
   const activity: IActivityData = {
     type: GithubActivityType.PULL_REQUEST_MERGED,
-    sourceId: `gen-ME_${data.payload.pull_request.node_id}_${memberData.memberFromApi.login}_${new Date(
-      data.timestamp,
+    sourceId: `gen-ME_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
+      data.createdAt,
     ).toISOString()}`,
-    sourceParentId: data.payload.pull_request.node_id,
-    timestamp: new Date(data.timestamp).toISOString(),
+    sourceParentId: relatedData.id,
+    timestamp: new Date(data.createdAt).toISOString(),
     body: '',
-    url: data.payload.pull_request.html_url,
+    url: relatedData.url,
     channel: apiData.repo.url,
     title: '',
     attributes: {
-      state: data.payload.pull_request.state.toLowerCase(),
-      additions: data.payload.pull_request.additions,
-      deletions: data.payload.pull_request.deletions,
-      changedFiles: data.payload.pull_request.changed_files,
-      authorAssociation: data.payload.pull_request.author_association,
-      labels: data.payload.pull_request.labels?.map((l) => l.name),
+      state: relatedData.state.toLowerCase(),
+      additions: relatedData.additions,
+      deletions: relatedData.deletions,
+      changedFiles: relatedData.changedFiles,
+      authorAssociation: relatedData.authorAssociation,
+      labels: relatedData.labels?.nodes.map((l) => l.name),
     },
     member,
     score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED].score,
@@ -438,22 +648,22 @@ const parsePullRequestMerged: ProcessDataHandler = async (ctx) => {
 
 const parseIssueOpened: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoIssuesResult
+  const data = apiData.data as GithubIssue
   const memberData = apiData.member
 
   const member = parseMember(memberData)
 
   const activity: IActivityData = {
     type: GithubActivityType.ISSUE_OPENED,
-    sourceId: data.payload.issue.node_id,
+    sourceId: data.id,
     sourceParentId: '',
-    timestamp: new Date(data.timestamp).toISOString(),
-    body: data.payload.issue.body,
-    url: data.payload.issue.html_url,
+    timestamp: new Date(data.createdAt).toISOString(),
+    body: data.bodyText,
+    url: data.url ? data.url : '',
     channel: apiData.repo.url,
-    title: data.payload.issue.title,
+    title: data.title.replace(/\0/g, ''),
     attributes: {
-      state: data.payload.issue.state.toLowerCase(),
+      state: data.state.toLowerCase(),
     },
     member,
     score: GITHUB_GRID[GithubActivityType.ISSUE_OPENED].score,
@@ -465,7 +675,8 @@ const parseIssueOpened: ProcessDataHandler = async (ctx) => {
 
 const parseIssueClosed: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoIssuesResult
+  const data = apiData.data as GithubIssueTimelineItem
+  const relatedData = apiData.relatedData as GithubIssue
   const memberData = apiData.member
   const repo = apiData.repo
 
@@ -473,17 +684,17 @@ const parseIssueClosed: ProcessDataHandler = async (ctx) => {
 
   const activity: IActivityData = {
     type: GithubActivityType.ISSUE_CLOSED,
-    sourceId: `gen-CE_${data.payload.issue.node_id}_${memberData.memberFromApi.login}_${new Date(
-      data.timestamp,
+    sourceId: `gen-CE_${relatedData.id}_${memberData.memberFromApi.login}_${new Date(
+      data.createdAt,
     ).toISOString()}`,
-    sourceParentId: data.payload.issue.node_id,
-    timestamp: new Date(data.timestamp).toISOString(),
+    sourceParentId: relatedData.id,
+    timestamp: new Date(data.createdAt).toISOString(),
     body: '',
-    url: data.payload.issue.html_url,
+    url: relatedData.url ? relatedData.url : '',
     channel: repo.url,
     title: '',
     attributes: {
-      state: data.payload.issue.state.toLowerCase(),
+      state: relatedData.state.toLowerCase(),
     },
     member,
     score: GITHUB_GRID[GithubActivityType.ISSUE_CLOSED].score,
@@ -495,18 +706,18 @@ const parseIssueClosed: ProcessDataHandler = async (ctx) => {
 
 const parsePullRequestComment: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoPullRequestReviewCommentsResult
+  const data = apiData.data
   const memberData = apiData.member
 
   const member = parseMember(memberData)
 
   const activity: IActivityData = {
     type: GithubActivityType.PULL_REQUEST_COMMENT,
-    sourceId: data.payload.comment.node_id,
-    sourceParentId: data.payload.pull_request.node_id,
-    timestamp: new Date(data.timestamp).toISOString(),
-    url: data.payload.comment._links.html.href,
-    body: data.payload.comment.body,
+    sourceId: data.id,
+    sourceParentId: data.pullRequest.id,
+    timestamp: new Date(data.createdAt).toISOString(),
+    url: data.url,
+    body: data.bodyText,
     channel: apiData.repo.url,
     member,
     score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_COMMENT].score,
@@ -516,20 +727,53 @@ const parsePullRequestComment: ProcessDataHandler = async (ctx) => {
   await ctx.publishActivity(activity)
 }
 
+const parsePullRequestReviewThreadComment: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT,
+    sourceId: data.id,
+    sourceParentId: data.pullRequest.id,
+    timestamp: new Date(data.createdAt).toISOString(),
+    body: data.bodyText,
+    url: data.url,
+    channel: apiData.repo.url,
+    title: '',
+    attributes: {
+      state: data.pullRequest.state.toLowerCase(),
+      additions: data.pullRequest.additions,
+      deletions: data.pullRequest.deletions,
+      changedFiles: data.pullRequest.changedFiles,
+      authorAssociation: data.pullRequest.authorAssociation,
+      labels: data.pullRequest.labels?.nodes.map((l) => l.name),
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT].score,
+    isContribution:
+      GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
 const parseIssueComment: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoIssueCommentsResult
+  const data = apiData.data
   const memberData = apiData.member
 
   const member = parseMember(memberData)
 
   const activity: IActivityData = {
     type: GithubActivityType.ISSUE_COMMENT,
-    sourceId: data.payload.comment.node_id,
-    sourceParentId: data.payload.issue.node_id,
-    timestamp: new Date(data.timestamp).toISOString(),
-    url: data.payload.comment.html_url,
-    body: data.payload.comment.body,
+    sourceId: data.id,
+    sourceParentId: data.issue.id,
+    timestamp: new Date(data.createdAt).toISOString(),
+    url: data.url,
+    body: data.bodyText,
     channel: apiData.repo.url,
     member,
     score: GITHUB_GRID[GithubActivityType.ISSUE_COMMENT].score,
@@ -539,57 +783,655 @@ const parseIssueComment: ProcessDataHandler = async (ctx) => {
   await ctx.publishActivity(activity)
 }
 
+const parseDiscussionComment: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data
+  const memberData = apiData.member
+  const sourceParentId = apiData.sourceParentId
+
+  const member = parseMember(memberData)
+
+  const subType = apiData.subType
+
+  let activity: IActivityData
+
+  if (subType === GithubActivitySubType.DISCUSSION_COMMENT_START) {
+    activity = {
+      type: GithubActivityType.DISCUSSION_COMMENT,
+      sourceId: data.id,
+      sourceParentId: data.discussion.id,
+      timestamp: new Date(data.createdAt).toISOString(),
+      url: data.url,
+      body: data.bodyText,
+      channel: apiData.repo.url,
+      attributes: {
+        isAnswer: data.isAnswer ?? undefined,
+      },
+      member,
+      score: data.isAnswer
+        ? GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score + 2
+        : GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score,
+      isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].isContribution,
+    }
+  } else if (subType === GithubActivitySubType.DISCUSSION_COMMENT_REPLY) {
+    activity = {
+      type: GithubActivityType.DISCUSSION_COMMENT,
+      sourceId: data.id,
+      sourceParentId,
+      timestamp: new Date(data.createdAt).toISOString(),
+      url: data.url,
+      body: data.bodyText,
+      channel: apiData.repo.url,
+      member,
+      score: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score,
+      isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].isContribution,
+    }
+  }
+
+  await ctx.publishActivity(activity)
+}
+
 const parseAuthoredCommit: ProcessDataHandler = async (ctx) => {
   const apiData = ctx.data as GithubApiData
-  const data = apiData.data as IGetRepoPushesResult
+  const data = apiData.data
   const memberData = apiData.member
 
-  for (const commit of data.payload.commits.filter((c) => c.distinct)) {
+  const member = parseMember(memberData)
+  const sourceParentId = apiData.sourceParentId // this is a pull request id
+
+  const activity: IActivityData = {
+    channel: apiData.repo.url,
+    url: `${apiData.repo.url}/commit/${data.commit.oid}`,
+    body: data.commit.message,
+    type: 'authored-commit',
+    sourceId: data.commit.oid,
+    sourceParentId: `${sourceParentId}`,
+    timestamp: new Date(data.commit.authoredDate).toISOString(),
+    attributes: {
+      insertions: 'additions' in data.commit ? data.commit.additions : 0,
+      deletions: 'deletions' in data.commit ? data.commit.deletions : 0,
+      lines:
+        'additions' in data.commit && 'deletions' in data.commit
+          ? data.commit.additions - data.commit.deletions
+          : 0,
+      isMerge: data.commit.parents.totalCount > 1,
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].score,
+    isContribution: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const parseWebhookIssue = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
+
+  const member = parseMember(memberData)
+
+  let type: GithubActivityType
+  let scoreGrid: IActivityScoringGrid
+  let timestamp: string
+  let sourceId: string
+  let sourceParentId: string
+  let body = ''
+  let title = ''
+
+  switch (payload.action) {
+    case 'edited':
+    case 'opened':
+    case 'reopened':
+      type = GithubActivityType.ISSUE_OPENED
+      scoreGrid = GITHUB_GRID[GithubActivityType.ISSUE_OPENED]
+      timestamp = payload.issue.created_at
+      sourceParentId = null
+      sourceId = payload.issue.node_id.toString()
+      body = payload.issue.body
+      title = payload.issue.title
+      break
+
+    case 'closed':
+      type = GithubActivityType.ISSUE_CLOSED
+      scoreGrid = GITHUB_GRID[GithubActivityType.ISSUE_CLOSED]
+      timestamp = payload.issue.closed_at
+      sourceParentId = payload.issue.node_id.toString()
+      sourceId = `gen-CE_${payload.issue.node_id.toString()}_${payload.sender.login}_${new Date(
+        payload.issue.closed_at,
+      ).toISOString()}`
+      break
+
+    default:
+      return
+  }
+
+  const issue = payload.issue
+
+  if (member) {
     const activity: IActivityData = {
-      channel: apiData.repo.url,
-      url: `${apiData.repo.url}/commit/${commit.sha}`,
-      body: commit.message,
-      type: 'authored-commit',
-      sourceId: commit.sha,
-      timestamp: new Date(data.timestamp).toISOString(),
+      member,
+      type,
+      timestamp: new Date(timestamp).toISOString(),
+      sourceId,
+      sourceParentId,
+      url: issue.html_url,
+      title,
+      channel: payload.repository.html_url,
+      body,
       attributes: {
-        prSha: data.payloadHead,
+        state: issue.state,
       },
-      // attributes: {
-      //   insertions: 'additions' in data.commit ? data.commit.additions : 0,
-      //   deletions: 'deletions' in data.commit ? data.commit.deletions : 0,
-      //   lines:
-      //     'additions' in data.commit && 'deletions' in data.commit
-      //       ? data.commit.additions - data.commit.deletions
-      //       : 0,
-      //   isMerge: data.commit.parents.totalCount > 1,
-      // },
-      member: parseMember(memberData, [commit.author.email]),
-      score: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].score,
-      isContribution: GITHUB_GRID[GithubActivityType.AUTHORED_COMMIT].isContribution,
+      score: scoreGrid.score,
+      isContribution: scoreGrid.isContribution,
     }
 
     await ctx.publishActivity(activity)
   }
 }
 
-const handler: ProcessDataHandler = async (ctx) => {
-  const data = ctx.data as any
-
-  const event = data?.type as GithubActivityType
+const parseWebhookDiscussion = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
 
-  // for webhoks we are using old code
-  const webhookEvent = data?.webhookType
+  const member = parseMember(memberData)
+  if (payload.action === 'answered') {
+    if (member) {
+      const answer = payload.answer
+      const activity: IActivityData = {
+        member,
+        type: GithubActivityType.DISCUSSION_COMMENT,
+        timestamp: new Date(answer.created_at).toISOString(),
+        sourceId: answer.node_id.toString(),
+        sourceParentId: payload.discussion.node_id.toString(),
+        attributes: {
+          isSelectedAnswer: true,
+        },
+        channel: payload.repository.html_url,
+        body: answer.body,
+        url: answer.html_url,
+        score: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].score + 2,
+        isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_COMMENT].isContribution,
+      }
 
-  const isOld = data?.isOld
+      await ctx.publishActivity(activity)
+    }
+  }
 
-  // this is for old events that don't have pullRequestNodeId
-  // generated during webhooks for pull requests
-  if (event === GithubActivityType.AUTHORED_COMMIT && (isOld || 'sourceParentId' in data)) {
-    await oldHandler(ctx)
+  if (!['edited', 'created'].includes(payload.action)) {
     return
   }
 
+  const discussion = payload.discussion
+
+  if (member) {
+    const activity: IActivityData = {
+      member,
+      type: GithubActivityType.DISCUSSION_STARTED,
+      timestamp: new Date(discussion.created_at).toISOString(),
+      sourceId: discussion.node_id.toString(),
+      sourceParentId: null,
+      url: discussion.html_url,
+      title: discussion.title,
+      channel: payload.repository.html_url,
+      body: discussion.body,
+      attributes: {
+        category: {
+          id: discussion.category.node_id,
+          isAnswerable: discussion.category.is_answerable,
+          name: discussion.category.name,
+          slug: discussion.category.slug,
+          emoji: discussion.category.emoji,
+          description: discussion.category.description,
+        },
+      },
+      score: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].score,
+      isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].isContribution,
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const parseWebhookPullRequest = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
+
+  const member = parseMember(memberData)
+  const objectMemberData = data.objectMember
+  const objectMember = objectMemberData ? parseMember(objectMemberData) : null
+
+  let type: GithubActivityType
+  let scoreGrid: IActivityScoringGrid
+  let timestamp: string
+  let sourceParentId: string
+  let sourceId: string
+  let body = ''
+  let title = ''
+
+  switch (payload.action) {
+    case 'edited':
+    case 'opened':
+    case 'reopened': {
+      type = GithubActivityType.PULL_REQUEST_OPENED
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_OPENED]
+      timestamp = payload.pull_request.created_at
+      sourceId = payload.pull_request.node_id.toString()
+      sourceParentId = null
+      body = payload.pull_request.body
+      title = payload.pull_request.title
+      break
+    }
+
+    case 'closed': {
+      type = GithubActivityType.PULL_REQUEST_CLOSED
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_CLOSED]
+      timestamp = payload.pull_request.closed_at
+      sourceParentId = payload.pull_request.node_id.toString()
+      sourceId = `gen-CE_${payload.pull_request.node_id.toString()}_${
+        payload.sender.login
+      }_${new Date(payload.pull_request.closed_at).toISOString()}`
+      break
+    }
+
+    case 'assigned': {
+      type = GithubActivityType.PULL_REQUEST_ASSIGNED
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_ASSIGNED]
+      timestamp = payload.pull_request.updated_at
+      sourceParentId = payload.pull_request.node_id.toString()
+      sourceId = `gen-AE_${payload.pull_request.node_id.toString()}_${payload.sender.login}_${
+        payload.assignee.login
+      }_${new Date(payload.pull_request.updated_at).toISOString()}`
+      break
+    }
+
+    case 'review_requested': {
+      type = GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED]
+      timestamp = payload.pull_request.updated_at
+      sourceParentId = payload.pull_request.node_id.toString()
+      sourceId = `gen-RRE_${payload.pull_request.node_id.toString()}_${payload.sender.login}_${
+        payload.requested_reviewer.login
+      }_${new Date(payload.pull_request.updated_at).toISOString()}`
+      break
+    }
+
+    case 'merged': {
+      type = GithubActivityType.PULL_REQUEST_MERGED
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_MERGED]
+      timestamp = payload.pull_request.merged_at
+      sourceParentId = payload.pull_request.node_id.toString()
+      sourceId = `gen-ME_${payload.pull_request.node_id.toString()}_${
+        payload.pull_request.merged_by?.login || member.identities[0].value
+      }_${new Date(payload.pull_request.merged_at).toISOString()}`
+      break
+    }
+
+    default: {
+      return undefined
+    }
+  }
+
+  const pull = payload.pull_request
+
+  if (member) {
+    const activity: IActivityData = {
+      member,
+      objectMember,
+      type,
+      timestamp: new Date(timestamp).toISOString(),
+      sourceId,
+      sourceParentId,
+      url: pull.html_url,
+      title,
+      channel: payload.repository.html_url,
+      body,
+      score: scoreGrid.score,
+      isContribution: scoreGrid.isContribution,
+      attributes: {
+        state: pull.state,
+        additions: pull.additions,
+        deletions: pull.deletions,
+        changedFiles: pull.changed_files,
+        authorAssociation: pull.author_association,
+        labels: pull.labels.map((l) => l.name),
+      },
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const parseWebhookPullRequestReview = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
+
+  const member = parseMember(memberData)
+
+  let type: GithubActivityType
+  let scoreGrid: IActivityScoringGrid
+  let timestamp: string
+  let sourceParentId: string
+  let sourceId: string
+  let body = ''
+
+  switch (payload.action) {
+    case 'submitted': {
+      // additional comments to existing review threads also result in submitted events
+      // since these will be handled in pull_request_review_comment.created events
+      // we're ignoring when state is commented and it has no body.
+      if (payload.review.state === 'commented' && payload.review.body === null) {
+        return undefined
+      }
+
+      type = GithubActivityType.PULL_REQUEST_REVIEWED
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEWED]
+      timestamp = payload.review.submitted_at
+      sourceParentId = payload.pull_request.node_id.toString()
+      sourceId = `gen-PRR_${payload.pull_request.node_id.toString()}_${
+        payload.sender.login
+      }_${new Date(payload.review.submitted_at).toISOString()}`
+      body = payload.review.body
+      break
+    }
+    default: {
+      return undefined
+    }
+  }
+
+  const pull = payload.pull_request
+
+  if (member) {
+    const activity: IActivityData = {
+      member,
+      type,
+      timestamp: new Date(timestamp).toISOString(),
+      sourceId,
+      sourceParentId,
+      url: pull.html_url,
+      title: '',
+      channel: payload.repository.html_url,
+      body,
+      score: scoreGrid.score,
+      isContribution: scoreGrid.isContribution,
+      attributes: {
+        reviewState: (payload.review?.state as string).toUpperCase(),
+        state: pull.state,
+        authorAssociation: pull.author_association,
+        labels: pull.labels.map((l) => l.name),
+      },
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const parseWebhookStar = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
+
+  const member = parseMember(memberData)
+
+  let type: GithubActivityType
+  switch (payload.action) {
+    case 'created': {
+      type = GithubActivityType.STAR
+      break
+    }
+
+    case 'deleted': {
+      type = GithubActivityType.UNSTAR
+      break
+    }
+
+    default: {
+      return
+    }
+  }
+
+  if (
+    member &&
+    (type === GithubActivityType.UNSTAR ||
+      (type === GithubActivityType.STAR && payload.starred_at !== null))
+  ) {
+    const starredAt =
+      type === GithubActivityType.STAR ? new Date(payload.starred_at).toISOString() : data.date
+
+    const activity: IActivityData = {
+      member,
+      type,
+      timestamp: starredAt,
+      sourceId: generateSourceIdHash(
+        payload.sender.login,
+        type,
+        Math.floor(new Date(starredAt).getTime() / 1000).toString(),
+        PlatformType.GITHUB,
+      ),
+      sourceParentId: null,
+      channel: payload.repository.html_url,
+      score:
+        type === 'star'
+          ? GITHUB_GRID[GithubActivityType.STAR].score
+          : GITHUB_GRID[GithubActivityType.UNSTAR].score,
+      isContribution:
+        type === 'star'
+          ? GITHUB_GRID[GithubActivityType.STAR].isContribution
+          : GITHUB_GRID[GithubActivityType.UNSTAR].isContribution,
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const parseWebhookFork = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+
+  // this is org member
+  if (data.orgMember && !data.member) {
+    const orgMember = parseOrgMember(data.orgMember)
+    if (orgMember) {
+      const activity: IActivityData = {
+        member: orgMember,
+        type: GithubActivityType.FORK,
+        timestamp: new Date(payload.forkee.created_at).toISOString(),
+        sourceId: payload.forkee.node_id.toString(),
+        sourceParentId: null,
+        channel: payload.repository.html_url,
+        score: GITHUB_GRID.fork.score,
+        isContribution: GITHUB_GRID.fork.isContribution,
+      }
+
+      await ctx.publishActivity(activity)
+    }
+    // this is member
+  } else if (data.member && !data.orgMember) {
+    const member = parseMember(data.member)
+    if (member) {
+      const activity: IActivityData = {
+        member,
+        type: GithubActivityType.FORK,
+        timestamp: new Date(payload.forkee.created_at).toISOString(),
+        sourceId: payload.forkee.node_id.toString(),
+        sourceParentId: null,
+        channel: payload.repository.html_url,
+        score: GITHUB_GRID.fork.score,
+        isContribution: GITHUB_GRID.fork.isContribution,
+      }
+
+      await ctx.publishActivity(activity)
+    } else if (data.member && data.orgMember) {
+      throw new Error('Both member and orgMember are present in webhook fork data')
+    } else if (!data.member && !data.orgMember) {
+      throw new Error('Both member and orgMember are missing in webhook fork data')
+    }
+  }
+}
+
+const parseWebhookComment = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
+
+  const member = parseMember(memberData)
+  let type: GithubActivityType
+  let sourceParentId: string | undefined
+
+  switch (data.webhookType) {
+    case GithubWehookEvent.DISCUSSION_COMMENT: {
+      switch (payload.action) {
+        case 'created':
+        case 'edited':
+          type = GithubActivityType.DISCUSSION_COMMENT
+          sourceParentId = payload.discussion.node_id.toString()
+          break
+        default:
+          return undefined
+      }
+      break
+    }
+
+    case GithubWehookEvent.ISSUE_COMMENT:
+    case GithubWehookEvent.PULL_REQUEST_COMMENT: {
+      switch (payload.action) {
+        case 'created':
+        case 'edited': {
+          if ('pull_request' in payload.issue) {
+            type = GithubActivityType.PULL_REQUEST_COMMENT
+          } else {
+            type = GithubActivityType.ISSUE_COMMENT
+          }
+          sourceParentId = payload.issue.node_id.toString()
+          break
+        }
+
+        default:
+          return
+      }
+      break
+    }
+
+    default: {
+      return
+    }
+  }
+
+  if (member) {
+    const comment = payload.comment
+    const activity: IActivityData = {
+      member,
+      type,
+      timestamp: new Date(comment.created_at).toISOString(),
+      sourceId: comment.node_id.toString(),
+      sourceParentId,
+      url: comment.html_url,
+      body: comment.body,
+      channel: payload.repository.html_url,
+      score: GITHUB_GRID[type].score,
+      isContribution: GITHUB_GRID[type].isContribution,
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const parseWebhookPullRequestReviewThreadComment = async (ctx: IProcessDataContext) => {
+  const data = ctx.data as GithubWebhookData
+  const payload = data.data
+  const memberData = data.member
+
+  const member = parseMember(memberData)
+
+  let type: GithubActivityType
+  let scoreGrid: IActivityScoringGrid
+  let timestamp: string
+  let sourceParentId: string
+  let sourceId: string
+  let body = ''
+
+  switch (payload.action) {
+    case 'created': {
+      type = GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT
+      scoreGrid = GITHUB_GRID[GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT]
+      timestamp = payload.comment.created_at
+      sourceParentId = payload.pull_request.node_id
+      sourceId = payload.comment.node_id
+      body = payload.comment.body
+      break
+    }
+    default: {
+      return undefined
+    }
+  }
+
+  if (member) {
+    const activity: IActivityData = {
+      member,
+      type,
+      timestamp: new Date(timestamp).toISOString(),
+      sourceId,
+      sourceParentId,
+      url: payload.comment.html_url,
+      title: '',
+      channel: payload.repository.html_url,
+      body,
+      score: scoreGrid.score,
+      isContribution: scoreGrid.isContribution,
+      attributes: {
+        state: payload.pull_request.state,
+        authorAssociation: payload.pull_request.author_association,
+        labels: payload.pull_request.labels.map((l) => l.name),
+      },
+    }
+
+    await ctx.publishActivity(activity)
+  }
+}
+
+const parseDiscussionStarted: ProcessDataHandler = async (ctx) => {
+  const apiData = ctx.data as GithubApiData
+  const data = apiData.data
+  const memberData = apiData.member
+
+  const member = parseMember(memberData)
+
+  const activity: IActivityData = {
+    type: GithubActivityType.DISCUSSION_STARTED,
+    sourceId: data.id,
+    sourceParentId: '',
+    timestamp: new Date(data.createdAt).toISOString(),
+    body: data.bodyText,
+    url: data.url ? data.url : '',
+    channel: apiData.repo.url,
+    title: data.title,
+    attributes: {
+      category: {
+        id: data.category.id,
+        isAnswerable: data.category.isAnswerable,
+        name: data.category.name,
+        slug: data.category.slug,
+        emoji: data.category.emoji,
+        description: data.category.description,
+      },
+    },
+    member,
+    score: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].score,
+    isContribution: GITHUB_GRID[GithubActivityType.DISCUSSION_STARTED].isContribution,
+  }
+
+  await ctx.publishActivity(activity)
+}
+
+const handler: ProcessDataHandler = async (ctx) => {
+  const data = ctx.data as any
+
+  const event = data?.type as GithubActivityType
+  const webhookEvent = data?.webhookType as GithubWehookEvent
+
   if (event) {
     // parse github api data
     switch (event) {
@@ -605,12 +1447,15 @@ const handler: ProcessDataHandler = async (ctx) => {
       case GithubActivityType.PULL_REQUEST_CLOSED:
         await parsePullRequestClosed(ctx)
         break
-      case GithubActivityType.PULL_REQUEST_COMMENT:
-        await parsePullRequestComment(ctx)
+      case GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED:
+        await parsePullRequestReviewRequested(ctx)
         break
       case GithubActivityType.PULL_REQUEST_REVIEWED:
         await parsePullRequestReviewed(ctx)
         break
+      case GithubActivityType.PULL_REQUEST_ASSIGNED:
+        await parsePullRequestAssigned(ctx)
+        break
       case GithubActivityType.PULL_REQUEST_MERGED:
         await parsePullRequestMerged(ctx)
         break
@@ -620,9 +1465,21 @@ const handler: ProcessDataHandler = async (ctx) => {
       case GithubActivityType.ISSUE_CLOSED:
         await parseIssueClosed(ctx)
         break
+      case GithubActivityType.PULL_REQUEST_COMMENT:
+        await parsePullRequestComment(ctx)
+        break
+      case GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT:
+        await parsePullRequestReviewThreadComment(ctx)
+        break
       case GithubActivityType.ISSUE_COMMENT:
         await parseIssueComment(ctx)
         break
+      case GithubActivityType.DISCUSSION_STARTED:
+        await parseDiscussionStarted(ctx)
+        break
+      case GithubActivityType.DISCUSSION_COMMENT:
+        await parseDiscussionComment(ctx)
+        break
       case GithubActivityType.AUTHORED_COMMIT:
         await parseAuthoredCommit(ctx)
         break
@@ -630,9 +1487,37 @@ const handler: ProcessDataHandler = async (ctx) => {
         await ctx.abortWithError(`Event not supported '${event}'!`)
     }
   } else if (webhookEvent) {
-    await oldHandler(ctx)
-  } else {
-    await ctx.abortWithError('No event type found in data!')
+    // TODO: implement webhook events
+    switch (webhookEvent) {
+      case GithubWehookEvent.ISSUES:
+        await parseWebhookIssue(ctx)
+        break
+      case GithubWehookEvent.DISCUSSION:
+        await parseWebhookDiscussion(ctx)
+        break
+      case GithubWehookEvent.PULL_REQUEST:
+        await parseWebhookPullRequest(ctx)
+        break
+      case GithubWehookEvent.PULL_REQUEST_REVIEW:
+        await parseWebhookPullRequestReview(ctx)
+        break
+      case GithubWehookEvent.STAR:
+        await parseWebhookStar(ctx)
+        break
+      case GithubWehookEvent.FORK:
+        await parseWebhookFork(ctx)
+        break
+      case GithubWehookEvent.DISCUSSION_COMMENT:
+      case GithubWehookEvent.ISSUE_COMMENT:
+      case GithubWehookEvent.PULL_REQUEST_COMMENT:
+        await parseWebhookComment(ctx)
+        break
+      case GithubWehookEvent.PULL_REQUEST_REVIEW_COMMENT:
+        await parseWebhookPullRequestReviewThreadComment(ctx)
+        break
+      default:
+        await ctx.abortWithError(`Webhook event not supported '${webhookEvent}'!`)
+    }
   }
 }
 
diff --git a/services/libs/integrations/src/integrations/github/processStream.ts b/services/libs/integrations/src/integrations/github/processStream.ts
index 5c60caf6d0..474f50053d 100644
--- a/services/libs/integrations/src/integrations/github/processStream.ts
+++ b/services/libs/integrations/src/integrations/github/processStream.ts
@@ -1,395 +1,1255 @@
+/* eslint-disable  @typescript-eslint/no-explicit-any */
 // processStream.ts content
-import {
-  GithubSnowflakeClient,
-  IBasicResponse,
-  IGetResponse,
-  SnowflakeClient,
-} from '@crowd/snowflake'
+import { createAppAuth } from '@octokit/auth-app'
+import { AuthInterface } from '@octokit/auth-app/dist-types/types'
 
-import { IProcessStreamContext, ProcessStreamHandler } from '../../types'
+import { singleOrDefault, timeout } from '@crowd/common'
+import { GraphQlQueryResponse, IConcurrentRequestLimiter } from '@crowd/types'
 
-import { capGithubArchive } from './cap'
 import {
+  IProcessStreamContext,
+  IProcessWebhookStreamContext,
+  ProcessStreamHandler,
+} from '../../types'
+
+import DiscussionCommentsQuery from './api/graphql/discussionComments'
+import DiscussionsQuery from './api/graphql/discussions'
+import ForksQuery from './api/graphql/forks'
+import IssueCommentsQuery from './api/graphql/issueComments'
+import IssuesQuery from './api/graphql/issues'
+import getMember from './api/graphql/members'
+import getOrganization from './api/graphql/organizations'
+import PullRequestCommentsQuery from './api/graphql/pullRequestComments'
+import PullRequestCommitsQuery, { PullRequestCommit } from './api/graphql/pullRequestCommits'
+import PullRequestCommitsQueryNoAdditions, {
+  PullRequestCommitNoAdditions,
+} from './api/graphql/pullRequestCommitsNoAdditions'
+import PullRequestReviewThreadCommentsQuery from './api/graphql/pullRequestReviewThreadComments'
+import PullRequestReviewThreadsQuery from './api/graphql/pullRequestReviewThreads'
+import PullRequestsQuery from './api/graphql/pullRequests'
+import StargazersQuery from './api/graphql/stargazers'
+import { GithubTokenRotator } from './tokenRotator'
+import {
+  GithubActivitySubType,
   GithubActivityType,
   GithubApiData,
   GithubBasicStream,
+  GithubBotMember,
+  GithubIntegrationSettings,
   GithubPlatformSettings,
   GithubPrepareMemberOutput,
+  GithubPrepareOrgMemberOutput,
+  GithubPullRequestEvents,
   GithubRootStream,
   GithubStreamType,
+  INDIRECT_FORK,
+  Repo,
+  Repos,
 } from './types'
 
-let sf: SnowflakeClient | undefined = undefined
-let gh: GithubSnowflakeClient | undefined = undefined
-
-let sfIncremental: SnowflakeClient | undefined = undefined
-let ghIncremental: GithubSnowflakeClient | undefined = undefined
-
-const initClient = (ctx: IProcessStreamContext) => {
-  const settings = ctx.platformSettings as GithubPlatformSettings
-  sf = new SnowflakeClient({
-    privateKeyString: settings.sfPrivateKey,
-    account: settings.sfAccount,
-    username: settings.sfUsername,
-    database: settings.sfDatabase,
-    warehouse: settings.sfWarehouse,
-    role: settings.sfRole,
-    parentLog: ctx.log,
-  })
-  gh = new GithubSnowflakeClient(sf)
+const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
+
+const containsHrefAttribute = (htmlSnippet: string) => {
+  // Constructing the regex using RegExp
+  const hrefRegex = new RegExp('href\\s*=\\s*["\'][^"\']*["\']', 'i')
+  return hrefRegex.test(htmlSnippet)
+}
+
+let githubAuthenticator: AuthInterface | undefined = undefined
+let concurrentRequestLimiter: IConcurrentRequestLimiter | undefined = undefined
+let tokenRotator: GithubTokenRotator | undefined = undefined
+
+function getAuth(ctx: IProcessStreamContext): AuthInterface | undefined {
+  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
+  const privateKey = GITHUB_CONFIG.privateKey
+    ? Buffer.from(GITHUB_CONFIG.privateKey, 'base64').toString('ascii')
+    : undefined
+
+  if (githubAuthenticator === undefined) {
+    githubAuthenticator = privateKey
+      ? createAppAuth({
+          appId: GITHUB_CONFIG.appId,
+          clientId: GITHUB_CONFIG.clientId,
+          clientSecret: GITHUB_CONFIG.clientSecret,
+          privateKey,
+        })
+      : undefined
+  }
+  return githubAuthenticator
+}
+
+export function getConcurrentRequestLimiter(
+  ctx: IProcessStreamContext | IProcessWebhookStreamContext,
+): IConcurrentRequestLimiter {
+  if (concurrentRequestLimiter === undefined) {
+    concurrentRequestLimiter = ctx.getConcurrentRequestLimiter(
+      50, // max 2 concurrent requests
+      'github-concurrent-request-limiter',
+    )
+  }
+  return concurrentRequestLimiter
+}
+
+export function getTokenRotator(ctx: IProcessStreamContext): GithubTokenRotator {
+  const GITHUB_CONFIG = ctx?.platformSettings as GithubPlatformSettings
+
+  // check if we have tokens configured
+  if (!GITHUB_CONFIG?.personalAccessTokens) {
+    // if tokenRotator is undefined, API requests won't use it
+    return undefined
+  }
+
+  if (tokenRotator === undefined) {
+    tokenRotator = new GithubTokenRotator(
+      ctx.globalCache,
+      GITHUB_CONFIG?.personalAccessTokens?.split(','),
+    )
+  }
+  return tokenRotator
 }
 
-const initIncrementalClient = (ctx: IProcessStreamContext) => {
-  const settings = ctx.platformSettings as GithubPlatformSettings
-  sfIncremental = new SnowflakeClient({
-    privateKeyString: settings.sfPrivateKey,
-    account: settings.sfAccount,
-    username: settings.sfUsername,
-    database: settings.sfDatabase,
-    warehouse: settings.sfIncrementalWarehouse,
-    role: settings.sfRole,
-    parentLog: ctx.log,
+export async function getGithubToken(ctx: IProcessStreamContext): Promise<string> {
+  const auth = getAuth(ctx)
+  if (auth) {
+    const authResponse = await auth({
+      type: 'installation',
+      installationId: ctx.integration.identifier,
+    })
+    const token = authResponse.token
+    // this is a real token, not a JWT token
+    // OctoKit automatically caches it for 1 hour and renews it when needed
+    return token
+  }
+
+  throw new Error('GitHub integration is not configured!')
+}
+
+async function getMemberData(ctx: IProcessStreamContext, login: string): Promise<any> {
+  const appToken = await getGithubToken(ctx)
+  return getMember(login, appToken, getTokenRotator(ctx), {
+    concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+    integrationId: ctx.integration.id,
   })
-  ghIncremental = new GithubSnowflakeClient(sfIncremental)
 }
 
-const getClient = (
-  ctx: IProcessStreamContext,
-): { sf: SnowflakeClient; gh: GithubSnowflakeClient } => {
-  if (ctx.onboarding) {
-    if (!sf) {
-      initClient(ctx)
-    }
-    return { sf, gh }
-  } else {
-    if (!sfIncremental) {
-      initIncrementalClient(ctx)
+async function getOrganizationData(ctx: IProcessStreamContext, company: string): Promise<any> {
+  if (company === '' || company === null || company === undefined) {
+    return null
+  }
+
+  const cache = ctx.globalCache
+  const prefix = (x: string) => `github-org:${x}`
+
+  const existing = await cache.get(prefix(company))
+  if (existing) {
+    if (existing === 'null') {
+      return null
     }
-    return { sf: sfIncremental, gh: ghIncremental }
+
+    return JSON.parse(existing)
   }
+
+  const token = await getGithubToken(ctx)
+  const fromAPI = await getOrganization(company, token, getTokenRotator(ctx), {
+    concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+    integrationId: ctx.integration.id,
+  })
+
+  if (fromAPI) {
+    await cache.set(prefix(company), JSON.stringify(fromAPI), 24 * 60 * 60)
+    return fromAPI
+  }
+
+  await cache.set(prefix(company), 'null', 24 * 60 * 60)
+  return null
 }
 
-const prepareMember = (data: IBasicResponse): GithubPrepareMemberOutput => {
-  const isBot = data.actorLogin.endsWith('[bot]')
-  return {
-    memberFromApi: {
-      id: data.actorId.toString(),
-      login: data.actorLogin,
-      avatarUrl: data.actorAvatarUrl,
-      ...(isBot ? { isBot: true } : {}),
-    },
-    org: {
-      id: data.orgId?.toString(),
-      login: data.orgLogin,
-      avatarUrl: data.orgAvatarUrl,
-    },
-    email: '',
+async function getMemberEmail(ctx: IProcessStreamContext, login: string): Promise<string> {
+  if (IS_TEST_ENV) {
+    return ''
   }
+
+  // here we use global cache - it is shared between all integrations
+  // So in LFX case different integration will have access to the same cache
+  // But this is fine
+  const cache = ctx.globalCache
+  const prefix = (x: string) => `github-login:${x}`
+
+  const existing = await cache.get(prefix(login))
+  if (existing) {
+    if (existing === 'null') {
+      return ''
+    }
+
+    return existing
+  }
+
+  const member = await getMemberData(ctx, login)
+  const email = (member && member.email ? member.email : '').trim()
+  if (email && email.length > 0) {
+    await cache.set(prefix(login), email, 24 * 60 * 60)
+    return email
+  }
+
+  await cache.set(prefix(login), 'null', 24 * 60 * 60)
+  return ''
 }
 
-const publishNextPageStream = async (ctx: IProcessStreamContext, response: IGetResponse) => {
+const publishNextPageStream = async (
+  ctx: IProcessStreamContext,
+  response: GraphQlQueryResponse,
+) => {
   const data = ctx.stream.data as GithubBasicStream
   // the last part of stream identifier is page number (e.g commits:12345:1)
   const streamIdentifier = ctx.stream.identifier.split(':').slice(0, -1).join(':')
-  if (response.hasNextPage) {
-    await ctx.publishStream<GithubBasicStream>(`${streamIdentifier}:${response.nextPage}`, {
+  if (response.hasPreviousPage) {
+    await ctx.publishStream<GithubBasicStream>(`${streamIdentifier}:${response.startCursor}`, {
       repo: data.repo,
-      sf_repo_id: data.sf_repo_id,
-      page: response.nextPage,
+      page: response.startCursor,
     })
-    return true
   }
-  return false
 }
 
-const processStargazersStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
+// this function extracts email and orgs from member data
+export const prepareMember = async (
+  memberFromApi: any,
+  ctx: IProcessStreamContext,
+): Promise<GithubPrepareMemberOutput> => {
+  const email = await getMemberEmail(ctx, memberFromApi.login)
 
-  const since_days_ago = ctx.onboarding ? undefined : '2'
+  let orgs: any
 
-  const result = await gh.getRepoStargazers({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
+  if (memberFromApi?.company) {
+    if (IS_TEST_ENV) {
+      orgs = [{ name: 'crowd.dev' }]
+    } else {
+      const companyHTML = memberFromApi?.companyHTML
+      // if company is matched againts github org it's html will contain href attribute
+      if (companyHTML && containsHrefAttribute(companyHTML)) {
+        const company = memberFromApi.company.replace('@', '').trim()
+        const fromAPI = await getOrganizationData(ctx, company)
+        orgs = fromAPI
+      } else {
+        orgs = null
+      }
+    }
+  }
 
-  for (const record of result.data) {
-    const member = prepareMember(record)
+  return {
+    email,
+    orgs,
+    memberFromApi,
+  }
+}
 
-    // publish data
-    await ctx.processData<GithubApiData>({
-      type: GithubActivityType.STAR,
-      data: record,
-      member,
-      repo: data.repo,
-    })
+export const prepareBotMember = (bot: GithubBotMember): GithubPrepareMemberOutput => {
+  return {
+    email: '',
+    orgs: [],
+    memberFromApi: {
+      login: bot.login,
+      avatarUrl: bot?.avatarUrl || bot?.avatar_url || '',
+      url: bot.url,
+      id: bot.id,
+      isBot: true,
+    },
   }
+}
 
-  await publishNextPageStream(ctx, result)
+export const prepareDeletedMember = (): GithubPrepareMemberOutput => {
+  return {
+    email: '',
+    orgs: [],
+    memberFromApi: {
+      login: 'ghost',
+      avatarUrl: 'https://avatars.githubusercontent.com/u/10137?v=4',
+      url: 'https://github.com/ghost',
+      isDeleted: true,
+    },
+  }
 }
 
-const processForksStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
+export const prepareMemberFromOrg = (orgFromApi: any): GithubPrepareOrgMemberOutput => {
+  return {
+    orgFromApi,
+  }
+}
+
+/**
+ * Searches given repository name among installed repositories
+ * Returns null if given repo is not found.
+ * @param name  The tenant we are working on
+ * @param context
+ * @returns Found repo object
+ */
+function getRepoByName(name: string, ctx: IProcessStreamContext): Repo | null {
+  const settings = ctx.integration.settings as GithubIntegrationSettings
+  const availableRepo: Repo | undefined = singleOrDefault(
+    settings?.orgs?.flatMap((o) => o.repos),
+    (r) => r.name === name,
+  )
+  if (availableRepo) {
+    return { ...availableRepo, available: true }
+  }
+
+  const unavailableRepo: Repo | undefined = singleOrDefault(
+    settings?.unavailableRepos,
+    (r) => r.name === name,
+  )
+  if (unavailableRepo) {
+    return { ...unavailableRepo, available: false }
+  }
+
+  return null
+}
 
-  const since_days_ago = ctx.onboarding ? undefined : '2'
+const processRootStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubRootStream
+  const repos: Repos = []
+  const unavailableRepos: Repos = []
+
+  for (const repo of data.reposToCheck) {
+    try {
+      // we don't need to get default 100 item per page, just 1 is enough to check if repo is available
+      const stargazersQuery = new StargazersQuery(repo, await getGithubToken(ctx), 1)
+      await stargazersQuery.getSinglePage('')
+      repos.push(repo)
+    } catch (e) {
+      if (e.rateLimitResetSeconds) {
+        throw e
+      } else {
+        ctx.log.warn(
+          `Repo ${repo.name} will not be parsed. It is not available with the github token`,
+        )
+        console.log('e', e)
+        unavailableRepos.push(repo)
+      }
+    }
+  }
 
-  const result = await gh.getRepoForks({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
+  // update integration settings
+  // this settings will be avaliable in next streams
+  await ctx.updateIntegrationSettings({
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ...(ctx.integration.settings as any),
+    repos,
+    unavailableRepos,
   })
 
+  // now it's time to start streams
+  for (const repo of repos) {
+    for (const endpoint of [
+      GithubStreamType.STARGAZERS,
+      GithubStreamType.FORKS,
+      GithubStreamType.PULLS,
+      GithubStreamType.ISSUES,
+      GithubStreamType.DISCUSSIONS,
+    ]) {
+      // this firstPage thing is important to avoid duplicate streams and for handleNextPageStream to work
+      await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
+        repo,
+        page: '',
+      })
+    }
+  }
+}
+
+const processStargazersStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const stargazersQuery = new StargazersQuery(data.repo, await getGithubToken(ctx))
+
+  const result = await stargazersQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
+  // handle next page
+  await publishNextPageStream(ctx, result)
+
   for (const record of result.data) {
-    const member = prepareMember(record)
+    if (record.node === null) {
+      throw new Error(
+        'Stargazer is not found. This might be a deleted user. Please check the data.',
+      )
+    }
+
+    const member = await prepareMember(record.node, ctx)
 
     // publish data
     await ctx.processData<GithubApiData>({
-      type: GithubActivityType.FORK,
+      type: GithubActivityType.STAR,
       data: record,
       member,
       repo: data.repo,
+      isOld: true,
     })
   }
-
-  await publishNextPageStream(ctx, result)
 }
 
-const processPullsStream: ProcessStreamHandler = async (ctx) => {
+const processForksStream: ProcessStreamHandler = async (ctx) => {
   const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
-
-  const since_days_ago = ctx.onboarding ? undefined : '2'
+  const forksQuery = new ForksQuery(data.repo, await getGithubToken(ctx))
+  const result = await forksQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
 
-  const result = await gh.getRepoPullRequests({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
   for (const record of result.data) {
-    const member = prepareMember(record)
-    const action = record.action
+    if (record.owner === null) {
+      throw new Error('Fork owner is not found. This might be a deleted user.')
+    }
+    if (record.owner.__typename === 'User') {
+      const member = await prepareMember(record.owner, ctx)
 
-    if (action === 'opened') {
+      // publish data
       await ctx.processData<GithubApiData>({
-        type: GithubActivityType.PULL_REQUEST_OPENED,
+        type: GithubActivityType.FORK,
         data: record,
         member,
         repo: data.repo,
+        isOld: true,
       })
-    } else if (action === 'closed') {
+    } else if (record.owner.__typename === 'Organization') {
+      const orgMember = prepareMemberFromOrg(record.owner)
+
+      // publish data
       await ctx.processData<GithubApiData>({
-        type: GithubActivityType.PULL_REQUEST_CLOSED,
+        type: GithubActivityType.FORK,
         data: record,
-        member,
+        orgMember,
         repo: data.repo,
+        isOld: true,
       })
+    } else {
+      ctx.log.warn(`Unsupported owner type: ${record.owner.__typename}`)
+    }
 
-      // additionall check if this PR is merged
-      if (record.payload.pull_request.merged) {
+    // traverse through indirect forks
+    for (const indirectFork of record.indirectForks.nodes) {
+      if (indirectFork.owner === null) {
+        throw new Error('Fork owner is not found. This might be a deleted user.')
+      }
+      if (indirectFork.owner.__typename === 'User') {
+        const member = await prepareMember(indirectFork.owner, ctx)
+
+        // publish data
         await ctx.processData<GithubApiData>({
-          type: GithubActivityType.PULL_REQUEST_MERGED,
-          data: record,
+          type: GithubActivityType.FORK,
+          subType: INDIRECT_FORK,
+          data: indirectFork,
+          relatedData: record,
           member,
           repo: data.repo,
+          isOld: true,
+        })
+      } else if (indirectFork.owner.__typename === 'Organization') {
+        const orgMember = prepareMemberFromOrg(indirectFork.owner)
+
+        // publish data
+        await ctx.processData<GithubApiData>({
+          type: GithubActivityType.FORK,
+          subType: INDIRECT_FORK,
+          data: indirectFork,
+          relatedData: record,
+          orgMember,
+          repo: data.repo,
+          isOld: true,
         })
+      } else {
+        ctx.log.warn(`Unsupported owner type: ${indirectFork.owner.__typename}`)
       }
-    } else {
-      ctx.log.debug(`Unsupported pull request action: ${action}`)
     }
   }
+}
 
+const processPullsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const forksQuery = new PullRequestsQuery(data.repo, await getGithubToken(ctx))
+  const result = await forksQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
+
+  // handle next page
   await publishNextPageStream(ctx, result)
+
+  for (const pull of result.data) {
+    let member: GithubPrepareMemberOutput
+    if (pull.author?.login) {
+      member = await prepareMember(pull.author, ctx)
+    } else if (pull.authorBot?.login) {
+      member = prepareBotMember(pull.authorBot)
+    } else if (pull.author === null && pull.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn('Pull request author is not found. This pull request will not be parsed.')
+      continue
+    }
+
+    // publish data
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.PULL_REQUEST_OPENED,
+      data: pull,
+      member,
+      repo: data.repo,
+      isOld: true,
+    })
+
+    // now we need to parse pullRequestEvents
+    for (const pullEvent of pull.timelineItems.nodes) {
+      switch (pullEvent.__typename) {
+        case GithubPullRequestEvents.ASSIGN: {
+          let member: GithubPrepareMemberOutput
+          let objectMember: GithubPrepareMemberOutput
+
+          if (pullEvent?.actor?.login) {
+            member = await prepareMember(pullEvent.actor, ctx)
+          } else if (pullEvent?.actorBot?.login) {
+            member = prepareBotMember(pullEvent.actorBot)
+          } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
+            member = prepareDeletedMember()
+          } else {
+            ctx.log.warn(
+              'Pull request author is not found. This pull request event will not be parsed.',
+            )
+            continue
+          }
+
+          if (pullEvent?.assignee?.login) {
+            objectMember = await prepareMember(pullEvent.assignee, ctx)
+          } else if (pullEvent?.assigneeBot?.login) {
+            objectMember = prepareBotMember(pullEvent.assigneeBot)
+          } else if (pullEvent.assignee === null && pullEvent.assigneeBot === null) {
+            objectMember = prepareDeletedMember()
+          } else {
+            ctx.log.warn(
+              'Pull request assignee is not found. This pull request assignee event will not be parsed.',
+            )
+            continue
+          }
+
+          await ctx.processData<GithubApiData>({
+            type: GithubActivityType.PULL_REQUEST_ASSIGNED,
+            data: pullEvent,
+            relatedData: pull,
+            member,
+            objectMember,
+            repo: data.repo,
+            isOld: true,
+          })
+
+          break
+        }
+        case GithubPullRequestEvents.REQUEST_REVIEW: {
+          // Requested review from single member
+          if (pullEvent?.requestedReviewer?.login || pullEvent?.requestedReviewerBot?.login) {
+            let member: GithubPrepareMemberOutput
+            let objectMember: GithubPrepareMemberOutput
+
+            if (pullEvent?.actor?.login) {
+              member = await prepareMember(pullEvent.actor, ctx)
+            } else if (pullEvent?.actorBot?.login) {
+              member = prepareBotMember(pullEvent.actorBot)
+            } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
+              member = prepareDeletedMember()
+            } else {
+              ctx.log.warn(
+                'Pull request author is not found. This pull request event will not be parsed.',
+              )
+              continue
+            }
+
+            if (pullEvent?.requestedReviewer?.login) {
+              objectMember = await prepareMember(pullEvent.requestedReviewer, ctx)
+            } else if (pullEvent?.requestedReviewerBot?.login) {
+              objectMember = prepareBotMember(pullEvent.requestedReviewerBot)
+            } else if (
+              pullEvent.requestedReviewer === null &&
+              pullEvent.requestedReviewerBot === null
+            ) {
+              objectMember = prepareDeletedMember()
+            } else {
+              ctx.log.warn(
+                'Pull request requested reviewer is not found. This pull request requested reviewer event will not be parsed.',
+              )
+              continue
+            }
+            await ctx.processData<GithubApiData>({
+              type: GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED,
+              data: pullEvent,
+              subType: GithubActivitySubType.PULL_REQUEST_REVIEW_REQUESTED_SINGLE,
+              relatedData: pull,
+              member,
+              objectMember,
+              repo: data.repo,
+              isOld: true,
+            })
+            // Requested review from multiple members
+          } else if (pullEvent?.requestedReviewer?.members) {
+            let member: GithubPrepareMemberOutput
+            if (pullEvent?.actor?.login) {
+              member = await prepareMember(pullEvent.actor, ctx)
+            } else if (pullEvent?.actorBot?.login) {
+              member = prepareBotMember(pullEvent.actorBot)
+            } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
+              member = prepareDeletedMember()
+            } else {
+              ctx.log.warn(
+                'Pull request author is not found. This pull request event will not be parsed.',
+              )
+              continue
+            }
+
+            for (const teamMember of pullEvent.requestedReviewer.members.nodes) {
+              const objectMember = await prepareMember(teamMember, ctx)
+              await ctx.processData<GithubApiData>({
+                type: GithubActivityType.PULL_REQUEST_REVIEW_REQUESTED,
+                data: pullEvent,
+                subType: GithubActivitySubType.PULL_REQUEST_REVIEW_REQUESTED_MULTIPLE,
+                relatedData: pull,
+                member,
+                objectMember,
+                repo: data.repo,
+                isOld: true,
+              })
+            }
+          }
+
+          break
+        }
+        case GithubPullRequestEvents.REVIEW: {
+          if ((pullEvent?.author?.login || pullEvent?.authorBot?.login) && pullEvent?.submittedAt) {
+            let member: GithubPrepareMemberOutput
+            if (pullEvent?.author?.login) {
+              member = await prepareMember(pullEvent.author, ctx)
+            } else if (pullEvent?.authorBot?.login) {
+              member = prepareBotMember(pullEvent.authorBot)
+            } else if (pullEvent.author === null && pullEvent.authorBot === null) {
+              member = prepareDeletedMember()
+            } else {
+              ctx.log.warn(
+                'Pull request author is not found. This pull request event will not be parsed.',
+              )
+              continue
+            }
+
+            await ctx.processData<GithubApiData>({
+              type: GithubActivityType.PULL_REQUEST_REVIEWED,
+              data: pullEvent,
+              relatedData: pull,
+              member,
+              repo: data.repo,
+              isOld: true,
+            })
+          }
+          break
+        }
+        case GithubPullRequestEvents.MERGE: {
+          let member: GithubPrepareMemberOutput
+          if (pullEvent?.actor?.login) {
+            member = await prepareMember(pullEvent.actor, ctx)
+          } else if (pullEvent?.actorBot?.login) {
+            member = prepareBotMember(pullEvent.actorBot)
+          } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
+            member = prepareDeletedMember()
+          } else {
+            ctx.log.warn(
+              'Pull request author is not found. This pull request event will not be parsed.',
+            )
+            continue
+          }
+
+          await ctx.processData<GithubApiData>({
+            type: GithubActivityType.PULL_REQUEST_MERGED,
+            data: pullEvent,
+            relatedData: pull,
+            member,
+            repo: data.repo,
+            isOld: true,
+          })
+
+          break
+        }
+        case GithubPullRequestEvents.CLOSE: {
+          let member: GithubPrepareMemberOutput
+          if (pullEvent?.actor?.login) {
+            member = await prepareMember(pullEvent.actor, ctx)
+          } else if (pullEvent?.actorBot?.login) {
+            member = prepareBotMember(pullEvent.actorBot)
+          } else if (pullEvent.actor === null && pullEvent.actorBot === null) {
+            member = prepareDeletedMember()
+          } else {
+            ctx.log.warn(
+              'Pull request author is not found. This pull request event will not be parsed.',
+            )
+            continue
+          }
+
+          await ctx.processData<GithubApiData>({
+            type: GithubActivityType.PULL_REQUEST_MERGED,
+            data: pullEvent,
+            relatedData: pull,
+            member,
+            repo: data.repo,
+            isOld: true,
+          })
+
+          break
+        }
+        default:
+          ctx.log.warn(
+            `Unsupported pull request event:  ${pullEvent.__typename}. This event will not be parsed.`,
+          )
+      }
+    }
+  }
+
+  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
+  const IS_GITHUB_COMMIT_DATA_ENABLED = GITHUB_CONFIG.isCommitDataEnabled === 'true'
+
+  if (IS_GITHUB_COMMIT_DATA_ENABLED) {
+    // publish new pull commits streams
+    // It is very important to keep commits first. Otherwise, we have problems
+    // creating conversations if the Git integration has already ran for those data points.
+    for (const pull of result.data) {
+      await ctx.publishStream<GithubBasicStream>(
+        `${GithubStreamType.PULL_COMMITS}:${pull.number}:firstPage`,
+        {
+          repo: data.repo,
+          page: '',
+          prNumber: pull.number,
+        },
+      )
+    }
+  }
+
+  // publish new pull comments streams
+  for (const pull of result.data) {
+    await ctx.publishStream<GithubBasicStream>(
+      `${GithubStreamType.PULL_COMMENTS}:${pull.number}:firstPage`,
+      {
+        repo: data.repo,
+        page: '',
+        prNumber: pull.number,
+      },
+    )
+  }
+
+  // publish new pull review threads streams
+  for (const pull of result.data) {
+    await ctx.publishStream<GithubBasicStream>(
+      `${GithubStreamType.PULL_REVIEW_THREADS}:${pull.number}:firstPage`,
+      {
+        repo: data.repo,
+        page: '',
+        prNumber: pull.number,
+      },
+    )
+  }
 }
 
 const processPullCommentsStream: ProcessStreamHandler = async (ctx) => {
   const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
-
-  const since_days_ago = ctx.onboarding ? undefined : '2'
+  const pullRequestNumber = data.prNumber
+  const pullRequestCommentsQuery = new PullRequestCommentsQuery(
+    data.repo,
+    pullRequestNumber,
+    await getGithubToken(ctx),
+  )
+
+  const result = await pullRequestCommentsQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
 
-  const result = await gh.getRepoPullRequestReviewComments({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
+  // get member info for each comment
   for (const record of result.data) {
-    const member = prepareMember(record)
+    let member: GithubPrepareMemberOutput
+    if (record.author?.login) {
+      member = await prepareMember(record.author, ctx)
+    } else if (record.authorBot?.login) {
+      member = prepareBotMember(record.authorBot)
+    } else if (record.author === null && record.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn(
+        'Pull request comment author is not found. This pull request comment will not be parsed.',
+      )
+      continue
+    }
 
+    // publish data
     await ctx.processData<GithubApiData>({
       type: GithubActivityType.PULL_REQUEST_COMMENT,
       data: record,
       member,
       repo: data.repo,
+      isOld: true,
     })
   }
+}
+
+const processPullReviewThreadsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const pullRequestNumber = data.prNumber
+  const pullRequestReviewThreadsQuery = new PullRequestReviewThreadsQuery(
+    data.repo,
+    pullRequestNumber,
+    await getGithubToken(ctx),
+  )
+
+  const result = await pullRequestReviewThreadsQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
 
+  // handle next page
   await publishNextPageStream(ctx, result)
+
+  // no data to publish, just add new streams for comments inside
+  // add each review thread as separate stream for comments inside
+  for (const thread of result.data) {
+    await ctx.publishStream<GithubBasicStream>(
+      `${GithubStreamType.PULL_REVIEW_THREAD_COMMENTS}:${thread.id}:firstPage`,
+      {
+        repo: data.repo,
+        page: '',
+        reviewThreadId: thread.id,
+      },
+    )
+  }
 }
 
-const processIssuesStream: ProcessStreamHandler = async (ctx) => {
+const processPullReviewThreadCommentsStream: ProcessStreamHandler = async (ctx) => {
   const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
-
-  const since_days_ago = ctx.onboarding ? undefined : '2'
+  const reviewThreadId = data.reviewThreadId
+  const pullRequestReviewThreadCommentsQuery = new PullRequestReviewThreadCommentsQuery(
+    data.repo,
+    reviewThreadId,
+    await getGithubToken(ctx),
+  )
+
+  const result = await pullRequestReviewThreadCommentsQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
 
-  const result = await gh.getRepoIssues({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
+  // get additional member info for each comment
   for (const record of result.data) {
-    const member = prepareMember(record)
+    let member: GithubPrepareMemberOutput
+    if (record.author?.login) {
+      member = await prepareMember(record.author, ctx)
+    } else if (record.authorBot?.login) {
+      member = prepareBotMember(record.authorBot)
+    } else if (record.author === null && record.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn(
+        'Pull request review thread comment author is not found. This pull request review thread comment will not be parsed.',
+      )
+      continue
+    }
+
+    // publish data
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.PULL_REQUEST_REVIEW_THREAD_COMMENT,
+      data: record,
+      member,
+      repo: data.repo,
+      isOld: true,
+    })
+  }
+}
 
-    const action = record.action
+export const processPullCommitsStream: ProcessStreamHandler = async (ctx) => {
+  let result: GraphQlQueryResponse
 
-    if (action === 'opened') {
-      await ctx.processData<GithubApiData>({
-        type: GithubActivityType.ISSUE_OPENED,
-        data: record,
-        member,
-        repo: data.repo,
-      })
-    } else if (action === 'closed') {
-      await ctx.processData<GithubApiData>({
-        type: GithubActivityType.ISSUE_CLOSED,
-        data: record,
-        member,
+  const data = ctx.stream.data as GithubBasicStream
+  const pullRequestNumber = data.prNumber
+
+  const token = await getGithubToken(ctx)
+
+  const pullRequestCommitsQuery = new PullRequestCommitsQuery(data.repo, pullRequestNumber, token)
+
+  try {
+    result = await pullRequestCommitsQuery.getSinglePage(
+      data.page,
+      {
+        concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+        integrationId: ctx.integration.id,
+      },
+      getTokenRotator(ctx),
+    )
+  } catch (err) {
+    ctx.log.warn(
+      {
+        err,
         repo: data.repo,
-      })
-    }
+        pullRequestNumber,
+      },
+      'Error while fetching pull request commits. Trying again without additions.',
+    )
+    const pullRequestCommitsQueryNoAdditions = new PullRequestCommitsQueryNoAdditions(
+      data.repo,
+      pullRequestNumber,
+      await getGithubToken(ctx),
+    )
+    result = await pullRequestCommitsQueryNoAdditions.getSinglePage(
+      data.page,
+      {
+        concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+        integrationId: ctx.integration.id,
+      },
+      getTokenRotator(ctx),
+    )
   }
 
+  // handle next page
   await publishNextPageStream(ctx, result)
+
+  // getting additional member info for each commit
+  {
+    const response = result.data[0] as PullRequestCommit | PullRequestCommitNoAdditions
+    const commits = response.repository.pullRequest.commits.nodes
+
+    for (const record of commits) {
+      for (const author of record.commit.authors.nodes) {
+        if (!author || !author?.user || !author?.user?.login) {
+          // eslint-disable-next-line no-continue
+          continue
+        }
+        const member = await prepareMember(author.user, ctx)
+
+        // publish data
+        await ctx.processData<GithubApiData>({
+          type: GithubActivityType.AUTHORED_COMMIT,
+          data: record,
+          sourceParentId: response.repository.pullRequest.id,
+          member,
+          repo: data.repo,
+          isOld: true,
+        })
+      }
+    }
+  }
 }
 
-const processIssueCommentsStream: ProcessStreamHandler = async (ctx) => {
+const processIssuesStream: ProcessStreamHandler = async (ctx) => {
   const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
-
-  const since_days_ago = ctx.onboarding ? undefined : '2'
+  const issuesQuery = new IssuesQuery(data.repo, await getGithubToken(ctx))
+  const result = await issuesQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
 
-  const result = await gh.getRepoIssueComments({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
-  for (const record of result.data) {
-    const member = prepareMember(record)
+  for (const issue of result.data) {
+    let member: GithubPrepareMemberOutput
+    if (issue.author?.login) {
+      member = await prepareMember(issue.author, ctx)
+    } else if (issue.authorBot?.login) {
+      member = prepareBotMember(issue.authorBot)
+    } else if (issue.author === null && issue.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn('Issue author is not found. This issue will not be parsed.')
+      continue
+    }
 
     await ctx.processData<GithubApiData>({
-      type: GithubActivityType.ISSUE_COMMENT,
-      data: record,
+      type: GithubActivityType.ISSUE_OPENED,
+      data: issue,
       member,
       repo: data.repo,
+      isOld: true,
     })
+
+    // now need to parse issue events
+    for (const issueEvent of issue.timelineItems.nodes) {
+      switch (issueEvent.__typename) {
+        case GithubPullRequestEvents.CLOSE: {
+          let member: GithubPrepareMemberOutput
+          if (issueEvent.actor?.login) {
+            member = await prepareMember(issueEvent.actor, ctx)
+          } else if (issueEvent.actorBot?.login) {
+            member = prepareBotMember(issueEvent.actorBot)
+          } else if (issueEvent.actor === null && issueEvent.actorBot === null) {
+            member = prepareDeletedMember()
+          } else {
+            ctx.log.warn('Issue event author is not found. This issue event will not be parsed.')
+            continue
+          }
+          await ctx.processData<GithubApiData>({
+            type: GithubActivityType.ISSUE_CLOSED,
+            data: issueEvent,
+            relatedData: issue,
+            member,
+            repo: data.repo,
+            isOld: true,
+          })
+
+          break
+        }
+        default:
+          ctx.log.warn(
+            `Unsupported issue event:  ${issueEvent.__typename}. This event will not be parsed.`,
+          )
+      }
+    }
   }
 
-  await publishNextPageStream(ctx, result)
+  // add each issue as separate stream for comments inside
+  for (const issue of result.data) {
+    await ctx.publishStream<GithubBasicStream>(
+      `${GithubStreamType.ISSUE_COMMENTS}:${issue.number}:firstPage`,
+      {
+        repo: data.repo,
+        page: '',
+        issueNumber: issue.number,
+      },
+    )
+  }
 }
 
-const processPullCommitsStream: ProcessStreamHandler = async (ctx) => {
+const processIssueCommentsStream: ProcessStreamHandler = async (ctx) => {
   const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
-
-  const since_days_ago = ctx.onboarding ? undefined : '2'
-
-  const result = await gh.getRepoPushes({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
+  const issueNumber = data.issueNumber
+  const issueCommentsQuery = new IssueCommentsQuery(
+    data.repo,
+    issueNumber,
+    await getGithubToken(ctx),
+  )
+  const result = await issueCommentsQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
+  // get additional member info for each comment
   for (const record of result.data) {
-    const member = prepareMember(record)
+    let member: GithubPrepareMemberOutput
+    if (record.author?.login) {
+      member = await prepareMember(record.author, ctx)
+    } else if (record.authorBot?.login) {
+      member = prepareBotMember(record.authorBot)
+    } else if (record.author === null && record.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn('Issue comment author is not found. This issue comment will not be parsed.')
+      continue
+    }
 
+    // publish data
     await ctx.processData<GithubApiData>({
-      type: GithubActivityType.AUTHORED_COMMIT,
+      type: GithubActivityType.ISSUE_COMMENT,
       data: record,
       member,
       repo: data.repo,
+      isOld: true,
     })
   }
-
-  await publishNextPageStream(ctx, result)
 }
 
-const processPullReviewsStream: ProcessStreamHandler = async (ctx) => {
+const processDiscussionsStream: ProcessStreamHandler = async (ctx) => {
   const data = ctx.stream.data as GithubBasicStream
-  const { gh } = getClient(ctx)
-
-  const since_days_ago = ctx.onboarding ? undefined : '2'
-
-  const result = await gh.getRepoPullRequestReviews({
-    sf_repo_id: data.sf_repo_id,
-    page: data.page,
-    since_days_ago,
-  })
-
-  for (const record of result.data) {
-    const member = prepareMember(record)
+  const discussionsQuery = new DiscussionsQuery(data.repo, await getGithubToken(ctx))
+  const result = await discussionsQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
-    // ignore commented reviews with no body
-    if (record.payload.review.state === 'commented' && record.payload.review.body === null) {
+  // get additional member info for each comment
+  for (const discussion of result.data) {
+    let member: GithubPrepareMemberOutput
+    if (discussion.author?.login) {
+      member = await prepareMember(discussion.author, ctx)
+    } else if (discussion.authorBot?.login) {
+      member = prepareBotMember(discussion.authorBot)
+    } else if (discussion.author === null && discussion.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn('Discussion author is not found. This discussion will not be parsed.')
       continue
     }
 
+    // publish data
     await ctx.processData<GithubApiData>({
-      type: GithubActivityType.PULL_REQUEST_REVIEWED,
-      data: record,
+      type: GithubActivityType.DISCUSSION_STARTED,
+      data: discussion,
       member,
       repo: data.repo,
+      isOld: true,
     })
   }
 
-  await publishNextPageStream(ctx, result)
+  // add each discussion as separate stream for comments inside
+  for (const d of result.data.filter((d) => d.comments.totalCount > 0)) {
+    await ctx.publishStream<GithubBasicStream>(
+      `${GithubStreamType.DISCUSSION_COMMENTS}:${d.id}:firstPage`,
+      {
+        repo: data.repo,
+        page: '',
+        discussionNumber: d.number,
+      },
+    )
+  }
 }
 
-const processRootStream: ProcessStreamHandler = async (ctx) => {
-  const data = ctx.stream.data as GithubRootStream
-  const repos = data.reposToCheck
+const processDiscussionCommentsStream: ProcessStreamHandler = async (ctx) => {
+  const data = ctx.stream.data as GithubBasicStream
+  const discussionCommentsQuery = new DiscussionCommentsQuery(
+    data.repo,
+    data.discussionNumber,
+    await getGithubToken(ctx),
+  )
+  const result = await discussionCommentsQuery.getSinglePage(
+    data.page,
+    {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    },
+    getTokenRotator(ctx),
+  )
+  // handle next page
+  await publishNextPageStream(ctx, result)
 
-  if (ctx.onboarding) {
-    await capGithubArchive(ctx, repos)
-  }
+  for (const record of result.data) {
+    let member: GithubPrepareMemberOutput
+    if (record.author?.login) {
+      member = await prepareMember(record.author, ctx)
+    } else if (record.authorBot?.login) {
+      member = prepareBotMember(record.authorBot)
+    } else if (record.author === null && record.authorBot === null) {
+      member = prepareDeletedMember()
+    } else {
+      ctx.log.warn(
+        'Discussion comment author is not found. This discussion comment will not be parsed.',
+      )
+      continue
+    }
+    const commentId = record.id
 
-  const { gh } = getClient(ctx)
+    // publish data
+    await ctx.processData<GithubApiData>({
+      type: GithubActivityType.DISCUSSION_COMMENT,
+      subType: GithubActivitySubType.DISCUSSION_COMMENT_START,
+      data: record,
+      member,
+      repo: data.repo,
+      isOld: true,
+    })
 
-  // now it's time to start streams
-  // derivative streams should be started later, otherwise conversations can't be created correctly
-  for (const repo of repos) {
-    const repoId = await gh.getRepoId({ repo: repo.url })
-    for (const endpoint of [
-      GithubStreamType.STARGAZERS,
-      GithubStreamType.FORKS,
-      GithubStreamType.PULLS,
-      GithubStreamType.ISSUES,
-      GithubStreamType.PULL_COMMITS,
-      GithubStreamType.PULL_REVIEWS,
-      GithubStreamType.PULL_COMMENTS,
-      GithubStreamType.ISSUE_COMMENTS,
-    ]) {
-      // this firstPage thing is important to avoid duplicate streams and for handleNextPageStream to work
-      await ctx.publishStream<GithubBasicStream>(`${endpoint}:${repo.name}:firstPage`, {
-        repo,
-        sf_repo_id: repoId,
-        page: 1,
+    // going through replies
+    for (const reply of record.replies.nodes) {
+      let member: GithubPrepareMemberOutput
+      if (reply.author?.login) {
+        member = await prepareMember(reply.author, ctx)
+      } else if (reply.authorBot?.login) {
+        member = prepareBotMember(reply.authorBot)
+      } else if (reply.author === null && reply.authorBot === null) {
+        member = prepareDeletedMember()
+      } else {
+        ctx.log.warn(
+          'Discussion comment reply author is not found. This discussion comment reply will not be parsed.',
+        )
+        continue
+      }
+
+      // publish data
+      await ctx.processData<GithubApiData>({
+        type: GithubActivityType.DISCUSSION_COMMENT,
+        subType: GithubActivitySubType.DISCUSSION_COMMENT_REPLY,
+        data: reply,
+        member,
+        sourceParentId: commentId,
+        repo: data.repo,
+        isOld: true,
       })
     }
   }
 }
 
 const handler: ProcessStreamHandler = async (ctx) => {
+  await timeout(1000)
   const streamIdentifier = ctx.stream.identifier
-
   if (streamIdentifier.startsWith(GithubStreamType.ROOT)) {
     await processRootStream(ctx)
   } else {
+    const data = ctx.stream.data as GithubBasicStream
+    const repo = getRepoByName(data.repo.name, ctx)
+
+    if (repo === null) {
+      await ctx.abortWithError(
+        `Stream ${ctx.stream.identifier} can't be processed since repo ${data.repo.name} is not found!`,
+        {
+          repoName: data.repo.name,
+          streamIdentifier: ctx.stream.identifier,
+        },
+      )
+    }
+
+    if (!repo.available) {
+      await ctx.abortWithError(
+        `Stream ${ctx.stream.identifier} can't be processed since repo ${data.repo.name} is not available!`,
+        {
+          repoName: data.repo.name,
+          streamIdentifier: ctx.stream.identifier,
+        },
+      )
+    }
+
+    // if all checks are passed, we can start processing
+
+    // Extract the stream type from the identifier
     const streamType = streamIdentifier.split(':')[0]
 
     switch (streamType) {
@@ -405,20 +1265,29 @@ const handler: ProcessStreamHandler = async (ctx) => {
       case GithubStreamType.PULL_COMMENTS:
         await processPullCommentsStream(ctx)
         break
+      case GithubStreamType.PULL_REVIEW_THREADS:
+        await processPullReviewThreadsStream(ctx)
+        break
+      case GithubStreamType.PULL_REVIEW_THREAD_COMMENTS:
+        await processPullReviewThreadCommentsStream(ctx)
+        break
       case GithubStreamType.PULL_COMMITS:
         await processPullCommitsStream(ctx)
         break
-      case GithubStreamType.PULL_REVIEWS:
-        await processPullReviewsStream(ctx)
-        break
       case GithubStreamType.ISSUES:
         await processIssuesStream(ctx)
         break
       case GithubStreamType.ISSUE_COMMENTS:
         await processIssueCommentsStream(ctx)
         break
+      case GithubStreamType.DISCUSSIONS:
+        await processDiscussionsStream(ctx)
+        break
+      case GithubStreamType.DISCUSSION_COMMENTS:
+        await processDiscussionCommentsStream(ctx)
+        break
       default:
-        ctx.log.error(`No matching process function for streamType: ${streamType}`)
+        console.error(`No matching process function for streamType: ${streamType}`)
     }
   }
 }
diff --git a/services/libs/integrations/src/integrations/github/processWebhookStream.ts b/services/libs/integrations/src/integrations/github/processWebhookStream.ts
index 9372a68102..ae82b8cab8 100644
--- a/services/libs/integrations/src/integrations/github/processWebhookStream.ts
+++ b/services/libs/integrations/src/integrations/github/processWebhookStream.ts
@@ -1,8 +1,475 @@
-import { ProcessWebhookStreamHandler } from '../../types'
-import { default as oldHandler } from '../github-old/processWebhookStream'
+/* eslint-disable  @typescript-eslint/no-explicit-any */
+import verifyGithubWebhook from 'verify-github-webhook'
+
+import {
+  IProcessStreamContext,
+  IProcessWebhookStreamContext,
+  ProcessWebhookStreamHandler,
+} from '../../types'
+
+import getMember from './api/graphql/members'
+import getOrganization from './api/graphql/organizations'
+import TeamsQuery from './api/graphql/teams'
+import { GithubWebhookTeam } from './api/graphql/types'
+import { prepareBotMember, prepareMember } from './processStream'
+import {
+  getConcurrentRequestLimiter,
+  getGithubToken,
+  processPullCommitsStream,
+} from './processStream'
+import {
+  GithubBasicStream,
+  GithubPlatformSettings,
+  GithubPrepareMemberOutput,
+  GithubPrepareOrgMemberOutput,
+  GithubStreamType,
+  GithubWebhookData,
+  GithubWebhookPayload,
+  GithubWebhookSubType,
+  GithubWehookEvent,
+  Repo,
+} from './types'
+
+const IS_TEST_ENV: boolean = process.env.NODE_ENV === 'test'
+
+const handleWebhookSender = async (
+  sender: any,
+  ctx: IProcessWebhookStreamContext,
+): Promise<GithubPrepareMemberOutput> => {
+  if (!sender) {
+    return undefined
+  }
+  if (!sender.type) {
+    ctx.log.error('Sender type is not defined in handleWebhookSender')
+    throw new Error('Sender type is not defined in handleWebhookSender')
+  }
+  if (sender.type === 'Bot') {
+    return prepareBotMember(sender)
+  } else if (sender.type === 'User') {
+    return prepareWebhookMember(sender.login, ctx)
+  } else {
+    ctx.log.error('Sender type is not supported in handleWebhookSender')
+    throw new Error('Sender type is not supported in handleWebhookSender')
+  }
+}
+
+const handleWebhookOrgSender = async (
+  sender: any,
+  ctx: IProcessWebhookStreamContext,
+): Promise<GithubPrepareOrgMemberOutput> => {
+  if (sender.type !== 'Organization') {
+    ctx.log.error('Sender is not an organization in handleWebhookOrgSender')
+    throw new Error('Sender is not an organization in handleWebhookOrgSender')
+  }
+  const token = await getGithubToken(ctx as IProcessStreamContext)
+  const orgFromApi = await getOrganization(sender.login, token)
+  if (!orgFromApi) {
+    ctx.log.warn(
+      { org: sender.login },
+      `Organization ${sender.login} not found in GitHub while fetching it from webhook data, skipping!`,
+    )
+    return null
+  }
+  return {
+    orgFromApi,
+  }
+}
+
+const prepareWebhookMember = async (
+  login: string,
+  ctx: IProcessWebhookStreamContext,
+): Promise<GithubPrepareMemberOutput> => {
+  if (IS_TEST_ENV) {
+    return {
+      memberFromApi: {
+        login: 'testMember',
+        name: 'testMember',
+      },
+      email: '',
+      orgs: [],
+    }
+  }
+
+  if (!login) {
+    ctx.log.warn('No login in webhook, skipping!')
+    return null
+  }
+
+  const token = await getGithubToken(ctx as IProcessStreamContext)
+  const member = await getMember(login, token)
+
+  if (!member) {
+    ctx.log.warn(
+      { login },
+      `Member ${login} not found in GitHub while fetching it from webhook data, skipping!`,
+    )
+    return null
+  }
+
+  const preparedMember = await prepareMember(member, ctx as IProcessStreamContext)
+  return preparedMember
+}
+
+async function verifyWebhookSignature(
+  signature: string,
+  data: any,
+  ctx: IProcessWebhookStreamContext,
+): Promise<void> {
+  if (IS_TEST_ENV) {
+    return
+  }
+
+  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
+  const secret = GITHUB_CONFIG.webhookSecret
+
+  let isVerified: boolean
+  try {
+    isVerified = verifyGithubWebhook(signature, JSON.stringify(data), secret) // Returns true if verification succeeds; otherwise, false.
+  } catch (err) {
+    await ctx.abortWithError(`Error during Github webhook verificaion\n${err}`)
+  }
+
+  if (!isVerified) {
+    await ctx.abortWithError('Github webhook not verified')
+  }
+}
+
+const parseWebhookIssue = async (payload: any, ctx: IProcessWebhookStreamContext) => {
+  const member = await handleWebhookSender(payload?.sender, ctx)
+
+  if (member) {
+    await ctx.processData<GithubWebhookData>({
+      webhookType: GithubWehookEvent.ISSUES,
+      data: payload,
+      member,
+    })
+  }
+}
+
+const parseWebhookDiscussion = async (payload: any, ctx: IProcessWebhookStreamContext) => {
+  let member: GithubPrepareMemberOutput | undefined
+  if (payload.action === 'answered') {
+    member = await handleWebhookSender(payload?.sender, ctx)
+
+    if (member) {
+      await ctx.processData<GithubWebhookData>({
+        webhookType: GithubWehookEvent.DISCUSSION,
+        subType: GithubWebhookSubType.DISCUSSION_COMMENT_REPLY,
+        data: payload,
+        member,
+      })
+    }
+  }
+
+  if (!['edited', 'created'].includes(payload.action)) {
+    return
+  }
+
+  const discussion = payload.discussion
+  member = await handleWebhookSender(discussion?.user, ctx)
+
+  if (member) {
+    await ctx.processData<GithubWebhookData>({
+      webhookType: GithubWehookEvent.DISCUSSION,
+      subType: GithubWebhookSubType.DISCUSSION_COMMENT_START,
+      data: payload,
+      member,
+    })
+  }
+}
+
+const parseWebhookPullRequestEvents = async (
+  payload: any,
+  ctx: IProcessWebhookStreamContext,
+): Promise<void> => {
+  const member = await handleWebhookSender(payload?.sender, ctx)
+  let objectMember: GithubPrepareMemberOutput | undefined
+
+  const GITHUB_CONFIG = ctx.platformSettings as GithubPlatformSettings
+  const IS_GITHUB_COMMIT_DATA_ENABLED = GITHUB_CONFIG.isCommitDataEnabled === 'true'
+
+  switch (payload.action) {
+    case 'edited':
+    case 'opened':
+    case 'reopened':
+    case 'closed':
+    case 'merged': {
+      if (member) {
+        await ctx.processData<GithubWebhookData>({
+          webhookType: GithubWehookEvent.PULL_REQUEST,
+          data: payload,
+          member,
+        })
+      }
+      break
+    }
+    case 'assigned': {
+      objectMember = await handleWebhookSender(payload?.requested_reviewer, ctx)
+
+      if (member && objectMember) {
+        await ctx.processData<GithubWebhookData>({
+          webhookType: GithubWehookEvent.PULL_REQUEST,
+          data: payload,
+          member,
+          objectMember,
+        })
+      }
+      break
+    }
+    case 'review_requested': {
+      objectMember = await handleWebhookSender(payload?.requested_reviewers?.[0], ctx)
+
+      if (member && objectMember) {
+        await ctx.processData<GithubWebhookData>({
+          webhookType: GithubWehookEvent.PULL_REQUEST,
+          data: payload,
+          member,
+          objectMember,
+        })
+      }
+      break
+    }
+    case 'synchronize': {
+      if (IS_GITHUB_COMMIT_DATA_ENABLED) {
+        const prNumber = payload.number
+        const repo: Repo = {
+          name: payload?.repository?.name,
+          owner: payload?.repository?.owner?.login,
+          url: payload?.repository?.html_url,
+          createdAt: payload?.repository?.created_at,
+        }
+
+        // this will create a CROWD_GENERATED webhook and stream for it
+        // this way we don't need integration run to publish new streams
+        await ctx.publishStream<GithubBasicStream>(
+          `${GithubStreamType.PULL_COMMITS}:${prNumber}:firstPage`,
+          {
+            repo,
+            page: '',
+            prNumber,
+          },
+        )
+      }
+      break
+    }
+  }
+}
+
+const parseWebhookPullRequest = async (payload: any, ctx: IProcessWebhookStreamContext) => {
+  // handle case of multiple reviewers (by assigning a team as a reviewer)
+  if (payload.action === 'review_requested' && payload.requested_team) {
+    // a team sent as reviewer, first we need to find members in this team
+    const team: GithubWebhookTeam = payload.requested_team
+    const token = await getGithubToken(ctx as IProcessStreamContext)
+    const teamMembers = await new TeamsQuery(team.node_id, token).getSinglePage('', {
+      concurrentRequestLimiter: getConcurrentRequestLimiter(ctx),
+      integrationId: ctx.integration.id,
+    })
+
+    for (const teamMember of teamMembers.data) {
+      await parseWebhookPullRequestEvents({ ...payload, requested_reviewer: teamMember }, ctx)
+    }
+
+    return
+  }
+
+  if (payload.action === 'closed' && payload.pull_request.merged) {
+    const revisedPayload = { ...payload, action: 'merged' }
+    revisedPayload.pull_request.state = 'merged'
+
+    await parseWebhookPullRequestEvents(revisedPayload, ctx)
+
+    return
+  }
+
+  await parseWebhookPullRequestEvents(payload, ctx)
+}
+
+const parseWebhookPullRequestReview = async (
+  payload: any,
+  ctx: IProcessWebhookStreamContext,
+): Promise<void> => {
+  if (payload.action === 'submitted') {
+    // additional comments to existing review threads also result in submitted events
+    // since these will be handled in pull_request_review_comment.created events
+    // we're ignoring when state is commented and it has no body.
+    if (payload.review.state === 'commented' && payload.review.body === null) {
+      return
+    }
+
+    const member = await handleWebhookSender(payload?.sender, ctx)
+
+    if (member) {
+      await ctx.processData<GithubWebhookData>({
+        webhookType: GithubWehookEvent.PULL_REQUEST_REVIEW,
+        data: payload,
+        member,
+      })
+    }
+  }
+}
+
+const parseWebhookStar = async (payload: any, ctx: IProcessWebhookStreamContext, date: string) => {
+  if (payload.action === 'created' || payload.action === 'deleted') {
+    const member = await handleWebhookSender(payload?.sender, ctx)
+
+    if (member) {
+      await ctx.processData<GithubWebhookData>({
+        webhookType: GithubWehookEvent.STAR,
+        data: payload,
+        member,
+        date,
+      })
+    }
+  }
+}
+
+const parseWebhookFork = async (payload: any, ctx: IProcessWebhookStreamContext) => {
+  if (payload?.sender?.type === 'Organization') {
+    const member = await handleWebhookOrgSender(payload?.sender, ctx)
+
+    if (member) {
+      await ctx.processData<GithubWebhookData>({
+        webhookType: GithubWehookEvent.FORK,
+        data: payload,
+        orgMember: member,
+      })
+    }
+    return
+  }
+
+  const member = await handleWebhookSender(payload?.sender, ctx)
+
+  if (member) {
+    await ctx.processData<GithubWebhookData>({
+      webhookType: GithubWehookEvent.FORK,
+      data: payload,
+      member,
+    })
+  }
+}
+
+const parseWebhookComment = async (
+  event: string,
+  payload: any,
+  ctx: IProcessWebhookStreamContext,
+) => {
+  let type: GithubWehookEvent
+  let sourceParentId: string
+
+  switch (event) {
+    case 'discussion_comment': {
+      switch (payload.action) {
+        case 'created':
+        case 'edited':
+          type = GithubWehookEvent.DISCUSSION_COMMENT
+          sourceParentId = payload.discussion.node_id.toString()
+          break
+        default:
+          return undefined
+      }
+      break
+    }
+
+    case 'issue_comment': {
+      switch (payload.action) {
+        case 'created':
+        case 'edited': {
+          if ('pull_request' in payload.issue) {
+            type = GithubWehookEvent.PULL_REQUEST_COMMENT
+          } else {
+            type = GithubWehookEvent.ISSUE_COMMENT
+          }
+          sourceParentId = payload.issue.node_id.toString()
+          break
+        }
+
+        default:
+          return
+      }
+      break
+    }
+
+    default: {
+      return
+    }
+  }
+
+  const member = await handleWebhookSender(payload?.sender, ctx)
+
+  if (member) {
+    await ctx.processData<GithubWebhookData>({
+      webhookType: type,
+      data: payload,
+      member,
+      sourceParentId,
+    })
+  }
+}
+
+const parseWebhookPullRequestReviewComment = async (
+  payload: any,
+  ctx: IProcessWebhookStreamContext,
+) => {
+  if (payload.action === 'created') {
+    const member = await handleWebhookSender(payload?.comment?.user, ctx)
+
+    if (member) {
+      await ctx.processData<GithubWebhookData>({
+        webhookType: GithubWehookEvent.PULL_REQUEST_REVIEW_COMMENT,
+        data: payload,
+        member,
+      })
+    }
+  }
+}
 
 const handler: ProcessWebhookStreamHandler = async (ctx) => {
-  await oldHandler(ctx)
+  const identifier = ctx.stream.identifier
+  const webhookCreatedAt = ctx.stream.webhookCreatedAt
+
+  // this is for pull request commits which are published during runtime
+  if (identifier.startsWith(GithubStreamType.PULL_COMMITS)) {
+    // we are reusing code here with another type of context
+    // everything should work except for ctx.aborRuntWithError
+    await processPullCommitsStream(ctx as IProcessStreamContext)
+  } else {
+    // this is for normal weqbook events
+    const { signature, event, data } = ctx.stream.data as GithubWebhookPayload
+
+    await verifyWebhookSignature(signature, data, ctx)
+
+    switch (event) {
+      case GithubWehookEvent.ISSUES:
+        await parseWebhookIssue(data, ctx)
+        break
+      case GithubWehookEvent.DISCUSSION:
+        await parseWebhookDiscussion(data, ctx)
+        break
+      case GithubWehookEvent.PULL_REQUEST:
+        await parseWebhookPullRequest(data, ctx)
+        break
+      case GithubWehookEvent.PULL_REQUEST_REVIEW:
+        await parseWebhookPullRequestReview(data, ctx)
+        break
+      case GithubWehookEvent.STAR:
+        await parseWebhookStar(data, ctx, webhookCreatedAt)
+        break
+      case GithubWehookEvent.FORK:
+        await parseWebhookFork(data, ctx)
+        break
+      case GithubWehookEvent.DISCUSSION_COMMENT:
+      case GithubWehookEvent.ISSUE_COMMENT:
+        await parseWebhookComment(event, data, ctx)
+        break
+      case GithubWehookEvent.PULL_REQUEST_REVIEW_COMMENT:
+        await parseWebhookPullRequestReviewComment(data, ctx)
+        break
+      default:
+        ctx.log.debug({ event }, 'Unknown Github webhook event!')
+        return
+    }
+  }
 }
 
 export default handler
diff --git a/services/libs/integrations/src/integrations/github-old/tokenRotator.ts b/services/libs/integrations/src/integrations/github/tokenRotator.ts
similarity index 100%
rename from services/libs/integrations/src/integrations/github-old/tokenRotator.ts
rename to services/libs/integrations/src/integrations/github/tokenRotator.ts
diff --git a/services/libs/integrations/src/integrations/github/types.ts b/services/libs/integrations/src/integrations/github/types.ts
index 9df0b3b5ef..1d0eef68fd 100644
--- a/services/libs/integrations/src/integrations/github/types.ts
+++ b/services/libs/integrations/src/integrations/github/types.ts
@@ -1,18 +1,21 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 export enum GithubActivityType {
+  DISCUSSION_STARTED = 'discussion-started',
   PULL_REQUEST_OPENED = 'pull_request-opened',
   PULL_REQUEST_CLOSED = 'pull_request-closed',
-  // PULL_REQUEST_REVIEW_REQUESTED = 'pull_request-review-requested',
+  PULL_REQUEST_REVIEW_REQUESTED = 'pull_request-review-requested',
   PULL_REQUEST_REVIEWED = 'pull_request-reviewed',
-  // PULL_REQUEST_ASSIGNED = 'pull_request-assigned',
+  PULL_REQUEST_ASSIGNED = 'pull_request-assigned',
   PULL_REQUEST_MERGED = 'pull_request-merged',
   ISSUE_OPENED = 'issues-opened',
   ISSUE_CLOSED = 'issues-closed',
   FORK = 'fork',
   STAR = 'star',
+  UNSTAR = 'unstar',
   PULL_REQUEST_COMMENT = 'pull_request-comment',
-  // PULL_REQUEST_REVIEW_THREAD_COMMENT = 'pull_request-review-thread-comment',
+  PULL_REQUEST_REVIEW_THREAD_COMMENT = 'pull_request-review-thread-comment',
   ISSUE_COMMENT = 'issue-comment',
+  DISCUSSION_COMMENT = 'discussion-comment',
   AUTHORED_COMMIT = 'authored-commit',
 }
 
@@ -79,16 +82,32 @@ export enum GithubWebhookSubType {
   DISCUSSION_COMMENT_REPLY = 'discussion-comment-reply',
 }
 
+export enum GithubWehookEvent {
+  ISSUES = 'issues',
+  DISCUSSION = 'discussion',
+  PULL_REQUEST = 'pull_request',
+  PULL_REQUEST_REVIEW = 'pull_request_review',
+  STAR = 'star',
+  FORK = 'fork',
+  DISCUSSION_COMMENT = 'discussion_comment',
+  PULL_REQUEST_REVIEW_COMMENT = 'pull_request_review_comment',
+  ISSUE_COMMENT = 'issue_comment',
+  PULL_REQUEST_COMMENT = 'pull_request_comment',
+}
+
 export enum GithubStreamType {
   ROOT = 'root',
   STARGAZERS = 'stargazers',
   FORKS = 'forks',
   PULLS = 'pulls',
   PULL_COMMENTS = 'pull-comments',
+  PULL_REVIEW_THREADS = 'pull-review-threads',
+  PULL_REVIEW_THREAD_COMMENTS = 'pull-review-thread-comments',
   PULL_COMMITS = 'pull-commits',
-  PULL_REVIEWS = 'pull-reviews',
   ISSUES = 'issues',
   ISSUE_COMMENTS = 'issue-comments',
+  DISCUSSIONS = 'discussions',
+  DISCUSSION_COMMENTS = 'discussion-comments',
 }
 
 export enum GithubManualStreamType {
@@ -97,6 +116,7 @@ export enum GithubManualStreamType {
   FORKS = 'forks',
   PULLS = 'pulls',
   ISSUES = 'issues',
+  DISCUSSIONS = 'discussions',
 }
 
 export const INDIRECT_FORK = 'indirect-fork'
@@ -111,6 +131,19 @@ export interface GithubApiData {
   objectMember?: GithubPrepareMemberOutput
   sourceParentId?: string
   repo: Repo
+  isOld: boolean
+}
+
+export interface GithubWebhookData {
+  webhookType: GithubWehookEvent
+  subType?: string
+  data: any[] | any
+  relatedData?: any | any[]
+  member?: GithubPrepareMemberOutput
+  orgMember?: GithubPrepareOrgMemberOutput
+  objectMember?: GithubPrepareMemberOutput
+  sourceParentId?: string
+  date?: string
 }
 
 export interface GithubRootStream {
@@ -119,8 +152,7 @@ export interface GithubRootStream {
 
 export interface GithubBasicStream {
   repo: Repo
-  sf_repo_id: string
-  page: number
+  page: string
   prNumber?: string
   reviewThreadId?: string
   issueNumber?: string
@@ -128,13 +160,6 @@ export interface GithubBasicStream {
 }
 
 export interface GithubPlatformSettings {
-  sfPrivateKey: string
-  sfAccount: string
-  sfUsername: string
-  sfDatabase: string
-  sfWarehouse: string
-  sfIncrementalWarehouse: string
-  sfRole: string
   appId: string
   clientId: string
   clientSecret: string
@@ -144,8 +169,6 @@ export interface GithubPlatformSettings {
   globalLimit?: number
   callbackUrl: string
   personalAccessTokens: string
-  tgNotifierToken: string
-  tgNotifierChatId: string
 }
 
 export interface GithubIntegrationSettings {
@@ -157,6 +180,7 @@ export interface GithubIntegrationSettings {
     updatedAt: string
     repos: Array<Repo>
   }>
+  unavailableRepos: Repos
 }
 
 export interface GitHubManualIntegrationSettingsDefault extends GithubIntegrationSettings {
@@ -182,9 +206,14 @@ export enum GithubPullRequestEvents {
 }
 
 export type Repo = {
-  name: string
   url: string
-  updatedAt: string
+  name: string
+  createdAt: string
+  owner: string
+  available?: boolean
+  fork?: boolean
+  private?: boolean
+  cloneUrl?: string
 }
 
 export type Repos = Array<Repo>
@@ -206,26 +235,8 @@ export interface AppTokenResponse {
 
 export interface GithubPrepareMemberOutput {
   email: string
-  org: {
-    id: string
-    login: string
-    avatarUrl: string
-  }
-  memberFromApi: {
-    id: string
-    login: string
-    avatarUrl: string
-    isBot?: boolean
-    isDeleted?: boolean
-    name?: string
-    bio?: string
-    location?: string
-    company?: string
-    url?: string
-    isHireable?: boolean
-    twitterUsername?: string
-    websiteUrl?: string
-  }
+  orgs: any
+  memberFromApi: any
 }
 
 export interface GithubBotMember {
diff --git a/services/libs/integrations/src/integrations/index.ts b/services/libs/integrations/src/integrations/index.ts
index 19ac68de40..840bb9868d 100644
--- a/services/libs/integrations/src/integrations/index.ts
+++ b/services/libs/integrations/src/integrations/index.ts
@@ -15,10 +15,10 @@ export * from './discourse/grid'
 export * from './discourse/types'
 export * from './discourse/memberAttributes'
 
-export * from './github-old/grid'
-export * from './github-old/types'
-export * from './github-old/memberAttributes'
-export * from './github-old/tokenRotator'
+export * from './github/grid'
+export * from './github/types'
+export * from './github/memberAttributes'
+export * from './github/tokenRotator'
 
 export * from './hackernews/grid'
 export * from './hackernews/types'
diff --git a/services/libs/integrations/src/integrations/prettyActivityTypes.ts b/services/libs/integrations/src/integrations/prettyActivityTypes.ts
index 3dc21f12fe..ddfdbd04ff 100644
--- a/services/libs/integrations/src/integrations/prettyActivityTypes.ts
+++ b/services/libs/integrations/src/integrations/prettyActivityTypes.ts
@@ -1,6 +1,6 @@
 import { PlatformType } from '@crowd/types'
 
-import { GithubActivityType } from './github-old/types'
+import { GithubActivityType } from './github/types'
 import { HackerNewsActivityType } from './hackernews/types'
 import { RedditActivityType } from './reddit/types'
 
diff --git a/services/libs/types/src/enums/platforms.ts b/services/libs/types/src/enums/platforms.ts
index b2eac7f5c0..4c1ffebd87 100644
--- a/services/libs/types/src/enums/platforms.ts
+++ b/services/libs/types/src/enums/platforms.ts
@@ -3,7 +3,7 @@ export enum PlatformType {
   SLACK = 'slack',
   DISCORD = 'discord',
   GITHUB = 'github',
-  GITHUB_OLD = 'github-old',
+  GITHUB_SNOWFLAKE = 'github-snowflake',
   TWITTER = 'twitter',
   REDDIT = 'reddit',
   HACKERNEWS = 'hackernews',