diff --git a/ocr-service-v1/ocr-service-processor/build.gradle.kts b/ocr-service-v1/ocr-service-processor/build.gradle.kts
index c48d3aa..cd62e16 100644
--- a/ocr-service-v1/ocr-service-processor/build.gradle.kts
+++ b/ocr-service-v1/ocr-service-processor/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     api("com.iqser.red.commons:metric-commons:2.1.0")
     api("com.iqser.red.commons:storage-commons:2.45.0")
     api("com.knecon.fforesight:lifecycle-commons:0.6.0")
-    api("com.knecon.fforesight:tenant-commons:RED-9331")
+    api("com.knecon.fforesight:tenant-commons:0.26.0")
     api("com.pdftron:PDFNet:10.5.0")
     api("org.apache.pdfbox:pdfbox:3.0.0")
     api("org.apache.pdfbox:jbig2-imageio:3.0.4")
diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java
index 47ce1cd..b7b0b87 100644
--- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java
+++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java
@@ -1,8 +1,8 @@
 package com.knecon.fforesight.service.ocr.v1.server.queue;
 
-
-import static com.knecon.fforesight.service.ocr.v1.server.configuration.MessagingConfiguration.*;
-import static com.knecon.fforesight.service.ocr.v1.server.configuration.TenantMessagingConfigurationImpl.*;
+import static com.knecon.fforesight.service.ocr.v1.server.configuration.MessagingConfiguration.OCR_DLQ;
+import static com.knecon.fforesight.service.ocr.v1.server.configuration.MessagingConfiguration.OCR_REQUEST_EXCHANGE;
+import static com.knecon.fforesight.service.ocr.v1.server.configuration.MessagingConfiguration.OCR_REQUEST_QUEUE_PREFIX;
 
 import java.util.Map;
 import java.util.Set;