diff --git a/base/Dockerfile b/base/Dockerfile
index f26fd76..c5c6887 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -35,7 +35,7 @@ RUN set -x \
 RUN ln -s /opt/hadoop-$HADOOP_VERSION/etc/hadoop /etc/hadoop
 
 # Make logs dir and data dir
-RUN mkdir /opt/hadoop-$HADOOP_VERSION/logs /hadoop-data
+RUN mkdir /opt/hadoop-$HADOOP_VERSION/logs /hadoop-data /hadoop /hadoop/dfs /hadoop/yarn
 
 # Set env
 ENV HADOOP_HOME=/opt/hadoop-$HADOOP_VERSION
@@ -61,7 +61,7 @@ RUN useradd -m -s /bin/bash hdoop
 ADD entrypoint.sh /entrypoint.sh
 
 # Set ownership for Hadoop dirs
-RUN chown -R hdoop:hdoop /opt/hadoop-$HADOOP_VERSION /etc/hadoop /hadoop-data
+RUN chown -R hdoop:hdoop /opt/hadoop-$HADOOP_VERSION /etc/hadoop /hadoop-data /hadoop
 
 # Make entrypoint.sh executable
 RUN chmod a+x /entrypoint.sh