diff --git a/email_service/src/email/email.service.ts b/email_service/src/email/email.service.ts
index 9bc3ee6..8412d5c 100644
--- a/email_service/src/email/email.service.ts
+++ b/email_service/src/email/email.service.ts
@@ -128,7 +128,12 @@ export class EmailService implements OnModuleInit, OnModuleDestroy {
             'x-message-ttl': 86400000, // 24 hours
           },
         });
-        await channel.assertQueue('failed.queue', { durable: true });
+        await channel.assertQueue('failed.queue', {
+          durable: true,
+          arguments: {
+            'x-message-ttl': 86400000, // 24 hours
+          },
+        });
 
         console.log('📬 Queues asserted');
         const queueInfo = await channel.checkQueue('email.queue');
diff --git a/push-service/src/push/push.service.ts b/push-service/src/push/push.service.ts
index 8307595..55ecafd 100644
--- a/push-service/src/push/push.service.ts
+++ b/push-service/src/push/push.service.ts
@@ -112,7 +112,12 @@ export class PushService implements OnModuleInit, OnModuleDestroy {
             'x-message-ttl': 86400000,
           },
         });
-        await channel.assertQueue('failed.queue', { durable: true });
+        await channel.assertQueue('failed.queue', {
+          durable: true,
+          arguments: {
+            'x-message-ttl': 86400000, // 24 hours
+          },
+        });
 
         const queueInfo = await channel.checkQueue('push.queue');
         console.log('📊 Queue Status BEFORE consuming:');
@@ -196,7 +201,6 @@ export class PushService implements OnModuleInit, OnModuleDestroy {
         data: message.metadata,
       });
 
-
       await this.updateStatus(
         correlationId,
         NotificationStatus.DELIVERED,
@@ -211,7 +215,6 @@ export class PushService implements OnModuleInit, OnModuleDestroy {
 
       channel.ack(msg);
       this.retryAttempts.delete(correlationId);
-
     } catch (error: any) {
       const attempts = this.retryAttempts.get(correlationId) || 0;
 
@@ -331,7 +334,6 @@ export class PushService implements OnModuleInit, OnModuleDestroy {
         JSON.stringify(updatedStatus),
       );
 
-
       const apiGatewayUrl =
         process.env.API_GATEWAY_URL || 'http://localhost:3000';