diff --git a/kafka/2.1.0/Dockerfile b/kafka/2.1.0/Dockerfile
new file mode 100644
index 0000000..463daed
--- /dev/null
+++ b/kafka/2.1.0/Dockerfile
@@ -0,0 +1,20 @@
+FROM openjdk:8-jre-alpine
+
+MAINTAINER Newnius <newnius.cn@gmail.com>
+
+# Prerequisites
+RUN apk add --no-cache bash
+
+# Install Kafka
+RUN wget -O kafka.tgz http://us.mirrors.quenda.co/apache/kafka/2.1.0/kafka_2.11-2.1.0.tgz && \
+	tar -xzf kafka.taz -C /usr/local/ && rm kafka.tgz
+
+RUN ln -s /usr/local/kafka_2.11-2.1.0 /usr/local/kafka
+
+ENV KAFKA_HOME /usr/local/kafka
+
+WORKDIR $KAFKA_HOME
+
+ADD start_kafka.sh /etc/start_kafka.sh
+
+CMD ["/etc/start_kafka.sh"]
diff --git a/kafka/2.1.0/README.md b/kafka/2.1.0/README.md
new file mode 100644
index 0000000..58776f2
--- /dev/null
+++ b/kafka/2.1.0/README.md
@@ -0,0 +1,12 @@
+TBD
+
+```bash
+docker service create \
+	--name kafka \
+	--hostname=kafka \
+	--network swarm-net \
+	--detach=true \
+	--replicas 1 \
+	--endpoint-mode dnsrr \
+	newnius/kafka:2.1.0
+```
diff --git a/kafka/2.1.0/start_kafka.sh b/kafka/2.1.0/start_kafka.sh
new file mode 100755
index 0000000..ef10f7a
--- /dev/null
+++ b/kafka/2.1.0/start_kafka.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+## Overide default configuration files
+: ${EXTRA_CONF_DIR:=/config/kafka}
+
+if [ -d "$EXTRA_CONF_DIR" ]; then
+	cp $EXTRA_CONF_DIR/* /usr/local/kafka/config
+fi
+
+bash /usr/local/kafka/bin/kafka-server-start.sh /usr/local/kafka/config/server.properties