diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 2c2c4a03..7c3edf24 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV REPO_URL=${REPO_URL}
 ENV I2PD_HOME="/home/i2pd"
 ENV DATA_DIR="${I2PD_HOME}/data"
 
-RUN mkdir -p "$I2PD_HOME" \
+RUN mkdir -p "$I2PD_HOME" "$DATA_DIR" \
     && adduser -S -h "$I2PD_HOME" i2pd \
     && chown -R i2pd:nobody "$I2PD_HOME"
 
diff --git a/contrib/docker/entrypoint.sh b/contrib/docker/entrypoint.sh
index 670ff577..ca9dddd4 100644
--- a/contrib/docker/entrypoint.sh
+++ b/contrib/docker/entrypoint.sh
@@ -7,8 +7,6 @@ DEFAULT_ARGS=" --datadir=$DATA_DIR --reseed.verify=true --upnp.enabled=false --h
 if [ "$1" = "--help" ]; then
     set -- $COMMAND --help
 else
-    # Create datadir 
-    mkdir -p "$DATA_DIR"
     ln -s /i2pd_certificates "$DATA_DIR"/certificates
     set -- $COMMAND $DEFAULT_ARGS $@
 fi