diff --git a/scientific_library/Dockerfile b/scientific_library/Dockerfile
index 718b8ca203..7acfc126f8 100644
--- a/scientific_library/Dockerfile
+++ b/scientific_library/Dockerfile
@@ -9,7 +9,8 @@ RUN conda install python=3.7 nomkl numba scipy numpy networkx scikit-learn cytho
 RUN apt-get install -y zip
 RUN cd /opt \
  && wget -q https://zenodo.org/record/3688773/files/tvb-data.zip?download=1 -O tvb_data.zip \
- && unzip tvb_data.zip \
+ && mkdir tvb_data \
+ && unzip tvb_data.zip -d tvb_data \
  && rm tvb_data.zip \
  && cd tvb_data \
  && python3 setup.py develop
diff --git a/tvb_build/docker/Dockerfile-build b/tvb_build/docker/Dockerfile-build
index 11325974b9..9fa6473725 100644
--- a/tvb_build/docker/Dockerfile-build
+++ b/tvb_build/docker/Dockerfile-build
@@ -35,8 +35,8 @@ RUN /bin/bash -c "source activate tvb-run"; \
 
 WORKDIR /root
 
-RUN wget https://zenodo.org/record/3688773/files/tvb-data.zip?download=1 -O tvb_data.zip; \
-    unzip tvb_data.zip; rm tvb_data.zip; \
+RUN wget https://zenodo.org/record/3688773/files/tvb-data.zip?download=1 -O tvb_data.zip;
+    mkdir tvb_data; unzip tvb_data.zip -d tvb_data; rm tvb_data.zip; \
     cd tvb_data; \
     /opt/conda/envs/tvb-run/bin/python setup.py develop;\
     /opt/conda/envs/tvb-docs/bin/python setup.py develop
diff --git a/tvb_build/docker/Dockerfile-run b/tvb_build/docker/Dockerfile-run
index b4cd0da977..a89ec0eeb6 100644
--- a/tvb_build/docker/Dockerfile-run
+++ b/tvb_build/docker/Dockerfile-run
@@ -25,8 +25,8 @@ RUN /bin/bash -c "source activate tvb-run"; \
 
 WORKDIR /root
 
-RUN wget https://zenodo.org/record/3688773/files/tvb-data.zip?download=1 -O tvb_data.zip; \
-    unzip tvb_data.zip; rm tvb_data.zip; \
+RUN wget https://zenodo.org/record/3688773/files/tvb-data.zip?download=1 -O tvb_data.zip;
+    mkdir tvb_data; unzip tvb_data.zip -d tvb_data; rm tvb_data.zip; \
     cd tvb_data; \
     /opt/conda/envs/tvb-run/bin/python setup.py develop