diff --git a/historyserver/Dockerfile b/historyserver/Dockerfile
new file mode 100644
index 0000000..6ad934e
--- /dev/null
+++ b/historyserver/Dockerfile
@@ -0,0 +1,16 @@
+FROM bde2020/hadoop-base:2.0.0-hadoop3.2.1-java8
+
+MAINTAINER Ivan Ermilov <ivan.s.ermilov@gmail.com>
+
+HEALTHCHECK CMD curl -f http://localhost:8188/ || exit 1
+
+ENV YARN_CONF_yarn_timeline___service_leveldb___timeline___store_path=/hadoop/yarn/timeline
+RUN mkdir -p /hadoop/yarn/timeline
+VOLUME /hadoop/yarn/timeline
+
+ADD run.sh /run.sh
+RUN chmod a+x /run.sh
+
+EXPOSE 8188
+
+CMD ["/run.sh"]
diff --git a/historyserver/run.sh b/historyserver/run.sh
new file mode 100644
index 0000000..56c8468
--- /dev/null
+++ b/historyserver/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$HADOOP_HOME/bin/yarn --config $HADOOP_CONF_DIR historyserver