diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/TenantQueueProviderConfig.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/TenantQueueProviderConfig.java
index 6e18d320..db0f92e6 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/TenantQueueProviderConfig.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/TenantQueueProviderConfig.java
@@ -35,15 +35,15 @@ public class TenantQueueProviderConfig {
 
     @Bean
     @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "false", matchIfMissing = true)
-    protected Set<TenantQueueConfiguration> getTenantQueueConfigs() {
+    protected TenantQueueProvider getTenantQueueConfigs() {
 
-        return Set.of(TenantQueueConfiguration.builder()
-                              .listenerId(MessageReceiver.REDACTION_REQUEST_LISTENER_ID)
-                              .exchangeName(REDACTION_REQUEST_EXCHANGE)
-                              .queuePrefix(REDACTION_REQUEST_QUEUE_PREFIX)
-                              .dlqName(REDACTION_DLQ)
-                              .arguments(Map.of("x-max-priority", 2))
-                              .build());
+        return new TenantQueueProvider(Set.of(TenantQueueConfiguration.builder()
+                                                      .listenerId(MessageReceiver.REDACTION_REQUEST_LISTENER_ID)
+                                                      .exchangeName(REDACTION_REQUEST_EXCHANGE)
+                                                      .queuePrefix(REDACTION_REQUEST_QUEUE_PREFIX)
+                                                      .dlqName(REDACTION_DLQ)
+                                                      .arguments(Map.of("x-max-priority", 2))
+                                                      .build()));
     }
 
 }