diff --git a/solution/kafka/Dockerfile b/solution/kafka/Dockerfile
index 8656bb1ffb..42987848e2 100644
--- a/solution/kafka/Dockerfile
+++ b/solution/kafka/Dockerfile
@@ -41,4 +41,8 @@ COPY log4j.properties ${KAFKA_HOME}/config/
 
 RUN chmod a+x ${KAFKA_HOME}/bin/*.sh
 
+RUN mv ${KAFKA_HOME}/bin/kafka-server-start.sh ${KAFKA_HOME}/bin/kafka-server-start-real.sh
+
+COPY --chmod=755 kafka-server-start.sh ${KAFKA_HOME}/bin/kafka-server-start.sh
+
 CMD ["kafka-server-start.sh"]
diff --git a/solution/kafka/kafka-server-start.sh b/solution/kafka/kafka-server-start.sh
new file mode 100644
index 0000000000..9ffc256637
--- /dev/null
+++ b/solution/kafka/kafka-server-start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+"$(dirname "$0")/kafka-server-start-real.sh" "$@"
+KAFKA_EXIT=$?
+printf "%d" "$KAFKA_EXIT" > /var/run/kafka-exit/code
+exit "$KAFKA_EXIT"