diff --git a/src/managers/commandManager.ts b/src/managers/commandManager.ts
index 2f5cea4..baffe29 100644
--- a/src/managers/commandManager.ts
+++ b/src/managers/commandManager.ts
@@ -61,14 +61,17 @@ class CommandManager {
   }
 
   private async loadCommands() {
-    const commandsDir = path.join(process.cwd(), 'src', 'commands');
+    const baseDir = config.ENV === 'production' ? path.join(__dirname, '..') : process.cwd();
+    const commandsDir = path.join(baseDir, config.ENV === 'production' ? 'commands' : 'src', 'commands');
+    const extension = config.ENV === 'production' ? '.js' : '.ts';
+
     commandLogger.info(`Loading commands from: ${commandsDir}`);
 
     try {
       const files = await fs.promises.readdir(commandsDir, { withFileTypes: true });
 
       for (const file of files) {
-        if (!file.isFile() || (!file.name.endsWith('.ts') && !file.name.endsWith('.js'))) {
+        if (!file.isFile() || !file.name.endsWith(extension)) {
           continue;
         }
 
diff --git a/src/managers/queueManager.ts b/src/managers/queueManager.ts
index 3351d5d..129b0e9 100644
--- a/src/managers/queueManager.ts
+++ b/src/managers/queueManager.ts
@@ -50,8 +50,9 @@ class QueueManager {
 
   private async processJob(job: Job) {
     const { jobName, params, socketId } = job.data;
-    const jobsDir = path.join(process.cwd(), 'src', 'jobs');
-    const extension = config.ENV === 'development' ? '.ts' : '.js';
+    const baseDir = config.ENV === 'production' ? path.join(__dirname, '..') : process.cwd();
+    const jobsDir = path.join(baseDir, config.ENV === 'production' ? 'jobs' : 'src', 'jobs');
+    const extension = config.ENV === 'production' ? '.js' : '.ts';
     const jobPath = path.join(jobsDir, `${jobName}${extension}`);
 
     queueLogger.info(`Processing job: ${jobName}`);