diff --git a/SDDI-CKAN-Docker source files/Dockerfile b/SDDI-CKAN-Docker source files/Dockerfile
index a61bc4176..74652abf6 100644
--- a/SDDI-CKAN-Docker source files/Dockerfile	
+++ b/SDDI-CKAN-Docker source files/Dockerfile	
@@ -16,6 +16,9 @@ RUN apt-get -q -y update \
         libxslt-dev \
         libgeos-dev \
         libssl-dev \
+        libxslt-dev \
+        libgeos-dev \
+        libssl-dev \
         libffi-dev \
         postgresql-client \
         build-essential \
@@ -23,7 +26,7 @@ RUN apt-get -q -y update \
         vim \
         wget \
     && apt-get -q clean \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y dos2unix
 
 # Define environment variables
 ENV CKAN_HOME /usr/lib/ckan
@@ -42,7 +45,7 @@ RUN useradd -r -u 900 -m -c "ckan account" -d $CKAN_HOME -s /bin/false ckan
 RUN mkdir -p $CKAN_VENV $CKAN_CONFIG $CKAN_STORAGE_PATH && \
     virtualenv $CKAN_VENV
 
-RUN curl -o $CKAN_VENV/get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py && \
+RUN curl -o $CKAN_VENV/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     . $CKAN_VENV/bin/activate && python $CKAN_VENV/get-pip.py 'pip==20.3.3' && \
     ln -s $CKAN_VENV/bin/pip /usr/local/bin/ckan-pip &&\
     ln -s $CKAN_VENV/bin/paster /usr/local/bin/ckan-paster 
@@ -59,6 +62,7 @@ RUN ckan-pip install -U pip && \
     cp -v $CKAN_VENV/src/ckan/contrib/docker/ckan-entrypoint.sh /ckan-entrypoint.sh && \
     chmod +x /ckan-entrypoint.sh && \
     chown -R ckan:ckan $CKAN_HOME $CKAN_VENV $CKAN_CONFIG $CKAN_STORAGE_PATH
+RUN dos2unix /ckan-entrypoint.sh && apt-get --purge remove -y dos2unix && rm -rf /var/lib/apt/lists/*                                                                                                         
 
 ENTRYPOINT ["/ckan-entrypoint.sh"]
 
diff --git a/SDDI-CKAN-Docker source files/contrib/docker/docker-compose.yml b/SDDI-CKAN-Docker source files/contrib/docker/docker-compose.yml
index 810fb81c2..ebbb0155d 100644
--- a/SDDI-CKAN-Docker source files/contrib/docker/docker-compose.yml	
+++ b/SDDI-CKAN-Docker source files/contrib/docker/docker-compose.yml	
@@ -8,6 +8,7 @@ volumes:
   ckan_storage:
   pg_data:
 
+
 services:
   ckan:
     container_name: ckan
@@ -58,6 +59,8 @@ services:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
       - pg_data:/var/lib/postgresql/data
+# In case you are using Windows 10 and Docker Desktop you may not be able to use named volume. So comment volume pg_data (lines 9 and 61) and instead uncomment line 63. This should do the job for now. It is a known bug for Windows docker. Please frequently check for a proper solution!
+      #- ./postgres_data1:/var/lib/postgresql/data
 
   solr:
     container_name: solr
diff --git a/SDDI-CKAN-Docker source files/requirements.txt b/SDDI-CKAN-Docker source files/requirements.txt
index b6419604c..d587f2cf3 100644
--- a/SDDI-CKAN-Docker source files/requirements.txt	
+++ b/SDDI-CKAN-Docker source files/requirements.txt	
@@ -7,17 +7,17 @@
 argparse==1.4.0           # via ofs
 Babel==2.3.4              # via flask-babel
 Beaker==1.9.0             # via pylons
-bleach==2.1.3
+bleach==3.3.0
 click==6.7
 decorator==4.2.1          # via pylons, sqlalchemy-migrate
 fanstatic==0.12
 Flask-Babel==0.11.2
-Flask==0.12.4             # via flask-babel
+Flask==0.12.5             # via flask-babel
 FormEncode==1.3.1         # via pylons
 funcsigs==1.0.2           # via beaker
 html5lib==1.0.1           # via bleach
 itsdangerous==0.24        # via flask
-Jinja2==2.10.1            # via flask, flask-babel
+Jinja2==2.11.3            # via flask, flask-babel
 Mako==1.0.7               # via pylons
 Markdown==2.6.7
 MarkupSafe==1.0           # via jinja2, mako, webhelpers
@@ -31,7 +31,7 @@ PasteScript==2.0.2        # via pylons
 pbr==1.10.0               # via sqlalchemy-migrate
 polib==1.0.7
 psycopg2==2.7.3.2
-Pygments==2.2.0           # via weberror
+Pygments==2.5.2           # via weberror
 Pylons==0.9.7
 pysolr==3.6.0
 python-dateutil==1.5
@@ -42,7 +42,7 @@ redis==2.10.6             # via rq
 repoze.lru==0.7           # via routes
 repoze.who-friendlyform==1.0.8
 repoze.who==2.3
-requests==2.11.1
+requests==2.20.0
 Routes==1.13              # via pylons
 rq==0.6.0
 simplejson==3.10.0
@@ -53,7 +53,7 @@ sqlparse==0.2.2
 Tempita==0.5.2            # via pylons, sqlalchemy-migrate, weberror
 tzlocal==1.3
 unicodecsv==0.14.1
-vdm==0.14
+vdm==0.15
 webencodings==0.5.1       # via html5lib
 WebError==0.13.1          # via pylons
 WebHelpers==1.3           # via pylons