diff --git a/message-bus-kafka/docker-compose.cluster.kafka.yml b/message-bus-kafka/docker-compose.cluster.kafka.yml
index 506b9fd7..bda4ca4b 100644
--- a/message-bus-kafka/docker-compose.cluster.kafka.yml
+++ b/message-bus-kafka/docker-compose.cluster.kafka.yml
@@ -8,6 +8,12 @@ services:
       placement:
         constraints:
           - "node.labels.name==${KAFKA_01_PLACEMENT}"
+    healthcheck:
+      test: ["CMD-SHELL", "df bitnami/kafka -h | tail -n 1 | awk '{print $$5}' | cut -d'%' -f1 | awk '{exit ($$1 > ${KAFKA_01_DISK_USAGE_THRESHOLD})}'"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
   kafka-02:
     image: ${KAFKA_IMAGE}
@@ -40,6 +46,12 @@ services:
           memory: ${KAFKA_MEMORY_RESERVE}
       restart_policy:
         condition: on-failure
+    healthcheck:
+      test: ["CMD-SHELL", "df bitnami/kafka -h | tail -n 1 | awk '{print $$5}' | cut -d'%' -f1 | awk '{exit ($$1 > ${KAFKA_02_DISK_USAGE_THRESHOLD})}'"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
     networks:
       public:
       default:
@@ -75,6 +87,12 @@ services:
           memory: ${KAFKA_MEMORY_RESERVE}
       restart_policy:
         condition: on-failure
+    healthcheck:
+      test: ["CMD-SHELL", "df bitnami/kafka -h | tail -n 1 | awk '{print $$5}' | cut -d'%' -f1 | awk '{exit ($$1 > ${KAFKA_03_DISK_USAGE_THRESHOLD})}'"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
     networks:
       public:
       default:
diff --git a/message-bus-kafka/package-metadata.json b/message-bus-kafka/package-metadata.json
index 6934efb3..5d7ed0b5 100644
--- a/message-bus-kafka/package-metadata.json
+++ b/message-bus-kafka/package-metadata.json
@@ -28,6 +28,9 @@
     "KMINION_CPU_LIMIT": "0",
     "KMINION_MEMORY_LIMIT": "3G",
     "KMINION_CPU_RESERVE": "0.05",
-    "KMINION_MEMORY_RESERVE": "500M"
+    "KMINION_MEMORY_RESERVE": "500M",
+    "KAFKA_01_DISK_USAGE_THRESHOLD": "90",
+    "KAFKA_02_DISK_USAGE_THRESHOLD": "90",
+    "KAFKA_03_DISK_USAGE_THRESHOLD": "90"
   }
 }