diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 92867dae89c..ffde4a65c07 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -21,5 +21,4 @@ COPY --from=builder /eos/Docker/nodeosd.sh /opt/eosio/bin/nodeosd.sh
 ENV EOSIO_ROOT=/opt/eosio
 RUN chmod +x /opt/eosio/bin/nodeosd.sh
 ENV LD_LIBRARY_PATH /usr/local/lib
-VOLUME /opt/eosio/bin/data-dir
 ENV PATH /opt/eosio/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/Docker/dev/Dockerfile b/Docker/dev/Dockerfile
index 2b7bf84987f..7df9a182b37 100644
--- a/Docker/dev/Dockerfile
+++ b/Docker/dev/Dockerfile
@@ -14,5 +14,4 @@ RUN pip3 install numpy
 ENV EOSIO_ROOT=/opt/eosio
 RUN chmod +x /opt/eosio/bin/nodeosd.sh
 ENV LD_LIBRARY_PATH /usr/local/lib
-VOLUME /opt/eosio/bin/data-dir
 ENV PATH /opt/eosio/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/Docker/nodeosd.sh b/Docker/nodeosd.sh
index b808ccad460..870548d6b6b 100755
--- a/Docker/nodeosd.sh
+++ b/Docker/nodeosd.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 cd /opt/eosio/bin
 
+if [ ! -d "/opt/eosio/bin/data-dir" ]; then
+    mkdir /opt/eosio/bin/data-dir
+fi
+
 if [ -f '/opt/eosio/bin/data-dir/config.ini' ]; then
     echo
   else