diff --git a/app/central_storage/backend/services/document_service.py b/app/central_storage/backend/services/document_service.py
index fa8bbe7..d3b773b 100644
--- a/app/central_storage/backend/services/document_service.py
+++ b/app/central_storage/backend/services/document_service.py
@@ -60,9 +60,7 @@ class DocumentService:
         document = await DocumentDoc.find_one(DocumentDoc.document_id == document_id)
         if not document:
             raise DoesNotExistError(
-                "Cannot find record with document id {document_id}".format(
-                    self.document_id
-                ),
+                f"Cannot find record with document id {document_id}"
             )
         self.__document_doc = document
         return
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d3160f5..b63a240 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
     networks:
       - freeleaps_service_hub_network
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:15672" ]
+      test: [ "CMD", "rabbitmq-diagnostics", "ping" ]
       interval: 30s
       retries: 5
       start_period: 10s