diff --git a/src/bot.ts b/src/bot.ts
index f099ef031..55f661aa1 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,19 +1,6 @@
-import { Octokit } from '@octokit/rest';
-import { Client, GatewayIntentBits } from 'discord.js';
+import { client } from './core/discord/client';
 import { secrets } from './core/node/secrets';
 import { registerErrorHandlers } from './events/error';
-import guildMemberAdd from './events/guildMemberAdd';
-import interactionCreate from './events/interactionCreate';
-import ready from './events/ready';
-
-export const client = new Client({
-  intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
-})
-  .on('ready', ready)
-  .on('guildMemberAdd', guildMemberAdd)
-  .on('interactionCreate', interactionCreate);
-
-export const octokit = new Octokit({ auth: secrets.GH_TOKEN });
 
 registerErrorHandlers();
 client.login(secrets.DISCORD_TOKEN);
diff --git a/src/commands/debug.ts b/src/commands/debug.ts
index fa7240883..238f42962 100644
--- a/src/commands/debug.ts
+++ b/src/commands/debug.ts
@@ -1,8 +1,8 @@
 import { SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
-import { client } from '../bot';
 import { tankopedia } from '../core/blitz/tankopedia';
 import { tankAverages } from '../core/blitzstars/tankAverages';
+import { client } from '../core/discord/client';
 import embedInfo from '../core/discord/embedInfo';
 import markdownTable from '../core/discord/markdownTable';
 import getClientId from '../core/node/getClientId';
diff --git a/src/core/database/getMidnightLeaderboard.ts b/src/core/database/getMidnightLeaderboard.ts
index b4032bb9d..b8a686a61 100644
--- a/src/core/database/getMidnightLeaderboard.ts
+++ b/src/core/database/getMidnightLeaderboard.ts
@@ -1,6 +1,6 @@
 import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
-import { octokit } from '../../bot';
 import { Region } from '../../constants/regions';
+import { octokit } from '../express/octokit';
 
 export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-db' };
 
diff --git a/src/core/discord/client.ts b/src/core/discord/client.ts
new file mode 100644
index 000000000..3b9e6bbd8
--- /dev/null
+++ b/src/core/discord/client.ts
@@ -0,0 +1,11 @@
+import { Client, GatewayIntentBits } from 'discord.js';
+import guildMemberAdd from '../../events/guildMemberAdd';
+import interactionCreate from '../../events/interactionCreate';
+import ready from '../../events/ready';
+
+export const client = new Client({
+  intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
+})
+  .on('ready', ready)
+  .on('guildMemberAdd', guildMemberAdd)
+  .on('interactionCreate', interactionCreate);
diff --git a/src/core/express/octokit.ts b/src/core/express/octokit.ts
new file mode 100644
index 000000000..6e87855d7
--- /dev/null
+++ b/src/core/express/octokit.ts
@@ -0,0 +1,4 @@
+import { Octokit } from '@octokit/rest';
+import { secrets } from '../node/secrets';
+
+export const octokit = new Octokit({ auth: secrets.GH_TOKEN });
diff --git a/src/events/error.ts b/src/events/error.ts
index c4104b5ff..537e06b29 100644
--- a/src/events/error.ts
+++ b/src/events/error.ts
@@ -1,7 +1,7 @@
 import { EmbedBuilder, TextChannel } from 'discord.js';
 import discord from '../../discord.json' assert { type: 'json' };
-import { client } from '../bot';
 import { NEGATIVE_COLOR } from '../constants/colors';
+import { client } from '../core/discord/client';
 import isDev from '../core/node/isDev';
 
 const PROCESS_ERROR_EVENTS = ['uncaughtException'];