diff --git a/src/config/env.config.ts b/src/config/env.config.ts
index c8e23944..72ca3573 100644
--- a/src/config/env.config.ts
+++ b/src/config/env.config.ts
@@ -284,7 +284,7 @@ export class ConfigService {
       },
       RABBITMQ: {
         ENABLED: process.env?.RABBITMQ_ENABLED === 'true',
-        MODE: (process.env?.RABBITMQ_MODE as Rabbitmq['MODE']) || 'single',
+        MODE: (process.env?.RABBITMQ_MODE as Rabbitmq['MODE']) || 'isolated',
         EXCHANGE_NAME: process.env?.RABBITMQ_EXCHANGE_NAME || 'evolution_exchange',
         URI: process.env.RABBITMQ_URI || '',
       },
diff --git a/src/libs/amqp.server.ts b/src/libs/amqp.server.ts
index 9500958c..7ee9f886 100644
--- a/src/libs/amqp.server.ts
+++ b/src/libs/amqp.server.ts
@@ -76,7 +76,7 @@ export const initQueues = (instanceName: string, events: string[]) => {
         autoDelete: false,
       });
 
-      const queueName = event;
+      const queueName = `${instanceName}.${event}`;
       amqp.assertQueue(queueName, {
         durable: true,
         autoDelete: false,
@@ -173,9 +173,8 @@ export const removeQueues = (instanceName: string, events: string[]) => {
         autoDelete: false,
       });
 
-      const queueName = event;
-
-      amqp.unbindQueue(queueName, exchangeName, event);
+      const queueName = `${instanceName}.${event}`;
+      amqp.deleteQueue(queueName);
     });
     amqp.deleteExchange(instanceName);
   }