diff --git a/index.js b/index.js
index 72d1ef2..d52769e 100644
--- a/index.js
+++ b/index.js
@@ -17,12 +17,11 @@ const client = new Client({
 
 // Load commands
 client.commands = new Collection();
-await loadCommandFromDir('fun');
-await loadCommandFromDir('secret');
-await loadCommandFromDir('utility');
-await loadCommandFromDir('voice');
-await loadCommandFromDir('admin');
-await loadCommandFromDir('owner');
+
+const categoryPath = fs.readdirSync(`${__dirname}/commands`);
+categoryPath.forEach(category => {
+	loadCommandFromDir(category);
+});
 
 // Load events
 await loadEventFromDir('client', client);
diff --git a/scripts/deploy-commands.js b/scripts/deploy-commands.js
index 2f7bb0b..c5e19e7 100644
--- a/scripts/deploy-commands.js
+++ b/scripts/deploy-commands.js
@@ -11,12 +11,10 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const commands = [];
-await loadCommandFromDir('fun');
-await loadCommandFromDir('secret');
-await loadCommandFromDir('utility');
-await loadCommandFromDir('voice');
-await loadCommandFromDir('admin');
-await loadCommandFromDir('owner');
+const categoryPath = fs.readdirSync(`${__dirname}/../commands`);
+categoryPath.forEach(category => {
+	loadCommandFromDir(category);
+});
 commands.map(command => command.toJSON());
 
 const rest = new REST({ version: '9' }).setToken(token);