diff --git a/docker-compose.yml b/docker-compose.yml
index 56ee377..b2f5aa1 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,8 +33,7 @@ services:
     
   datapusher:
     container_name: datapusher
-    build:
-      context: datapusher/
+    image: kowhai/datapusher:0.0.17
     ports:
       - "8800:8800"
 
diff --git a/images/ckan-dev/README b/images/README
similarity index 100%
rename from images/ckan-dev/README
rename to images/README
diff --git a/images/ckan-base/2.9/Dockerfile b/images/ckan-base/2.9/Dockerfile
index 7f23965..d2665cd 100755
--- a/images/ckan-base/2.9/Dockerfile
+++ b/images/ckan-base/2.9/Dockerfile
@@ -99,4 +99,4 @@ EXPOSE 5000
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
 
-CMD ["/srv/app/start_ckan.sh"]
\ No newline at end of file
+CMD ["/srv/app/start_ckan.sh"] 
\ No newline at end of file
diff --git a/images/datapusher/Dockerfile b/images/datapusher/Dockerfile
new file mode 100755
index 0000000..8d52845
--- /dev/null
+++ b/images/datapusher/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.13.5
+
+ENV APP_DIR=/srv/app
+ENV SRC_DIR=${APP_DIR}/src
+ENV GIT_URL https://github.com/ckan/datapusher.git
+ENV GIT_BRANCH 0.0.17
+ENV JOB_CONFIG ${APP_DIR}/datapusher_settings.py
+ENV CKAN__PLUGINS image_view text_view recline_view datastore datapusher envvars
+
+WORKDIR ${APP_DIR}
+
+RUN apk upgrade && \
+    apk add --no-cache \
+        python3 \
+        curl \
+        gcc \
+        make \
+        g++ \
+        autoconf \
+        automake \
+        libtool \
+        git \
+        musl-dev \
+        python3-dev \
+        libffi-dev \
+        openssl-dev \
+        libxml2-dev \
+        libxslt-dev \
+        rust  \
+        cargo
+
+RUN apk add --no-cache \
+        uwsgi \
+        uwsgi-http \
+        uwsgi-corerouter \
+        uwsgi-python
+
+# Create the src directory
+RUN mkdir -p ${SRC_DIR}
+
+# Install pip
+RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python3 ${SRC_DIR}/get-pip.py
+
+# Install datapusher
+RUN cd ${SRC_DIR} && \
+    git clone -b ${GIT_BRANCH} --depth=1 --single-branch ${GIT_URL} && \
+    cd datapusher && \
+    python3 setup.py install && \
+    pip3 install --no-cache-dir -r requirements.txt
+
+RUN cp ${APP_DIR}/src/datapusher/deployment/*.* ${APP_DIR} && \
+    # Remove default values in ini file
+    sed -i '/http/d' ${APP_DIR}/datapusher-uwsgi.ini && \
+    sed -i '/wsgi-file/d' ${APP_DIR}/datapusher-uwsgi.ini && \
+    sed -i '/virtualenv/d' ${APP_DIR}/datapusher-uwsgi.ini && \
+    # Remove src files
+    rm -rf ${APP_DIR}/src
+
+# Create a 'ckan' local user and group to run the app
+RUN addgroup -g 92 -S www-data && \
+    adduser -u 92 -h /srv/app -H -D -S -G www-data www-data
+
+# Set timezone
+RUN echo "UTC" >  /etc/timezone && \
+    # Change ownership to app user
+    chown -R www-data:www-data /srv/app
+
+EXPOSE 8800
+CMD ["sh", "-c", \
+    "uwsgi --plugins=http,python --http=0.0.0.0:8800 --socket=/tmp/uwsgi.sock --ini=`echo ${APP_DIR}`/datapusher-uwsgi.ini --wsgi-file=`echo ${APP_DIR}`/datapusher.wsgi"]