diff --git a/scrapyd/Dockerfile b/scrapyd/Dockerfile
index 0833bc0..c8adb0b 100644
--- a/scrapyd/Dockerfile
+++ b/scrapyd/Dockerfile
@@ -47,6 +47,7 @@ RUN set -xe \
     && echo 'source /etc/bash_completion.d/scrapy_bash_completion' >> /root/.bashrc \
     && apt-get purge -y --auto-remove autoconf \
                                       build-essential \
+                                      curl \
                                       libffi-dev \
                                       libssl-dev \
                                       libtool \
diff --git a/scrapyd/arm/Dockerfile b/scrapyd/arm/Dockerfile
index 055a335..2c3b1ee 100644
--- a/scrapyd/arm/Dockerfile
+++ b/scrapyd/arm/Dockerfile
@@ -1,10 +1,14 @@
 #
-# Dockerfile for scrapyd-arm
+# Dockerfile for scrapyd-arm (python3)
 #
 
-FROM resin/rpi-raspbian:stretch
+FROM arm32v7/debian:buster
 MAINTAINER EasyPi Software Foundation
 
+ENV SCRAPY_VERSION=2.1.0
+ENV SCRAPYD_VERSION=1.2.1
+ENV PILLOW_VERSION=7.1.2
+
 RUN set -xe \
     && apt-get update \
     && apt-get install -y autoconf \
@@ -18,8 +22,8 @@ RUN set -xe \
                           libxml2-dev \
                           libxslt1.1 \
                           libxslt1-dev \
-                          python \
-                          python-dev \
+                          python3 \
+                          python3-dev \
                           vim-tiny \
     && apt-get install -y libtiff5 \
                           libtiff5-dev \
@@ -32,23 +36,24 @@ RUN set -xe \
                           libwebp-dev \
                           zlib1g \
                           zlib1g-dev \
-    && curl -sSL https://bootstrap.pypa.io/get-pip.py | python \
-    && pip install git+https://github.com/scrapy/scrapy.git \
-                   git+https://github.com/scrapy/scrapyd.git \
+    && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 \
+    && pip install git+https://github.com/scrapy/scrapy.git@$SCRAPY_VERSION \
+                   git+https://github.com/scrapy/scrapyd.git@$SCRAPYD_VERSION \
                    git+https://github.com/scrapy/scrapyd-client.git \
                    git+https://github.com/scrapinghub/scrapy-splash.git \
                    git+https://github.com/scrapinghub/scrapyrt.git \
-                   git+https://github.com/python-pillow/Pillow.git \
+                   git+https://github.com/python-pillow/Pillow.git@$PILLOW_VERSION \
     && curl -sSL https://github.com/scrapy/scrapy/raw/master/extras/scrapy_bash_completion -o /etc/bash_completion.d/scrapy_bash_completion \
     && echo 'source /etc/bash_completion.d/scrapy_bash_completion' >> /root/.bashrc \
     && apt-get purge -y --auto-remove autoconf \
                                       build-essential \
+                                      curl \
                                       libffi-dev \
                                       libssl-dev \
                                       libtool \
                                       libxml2-dev \
                                       libxslt1-dev \
-                                      python-dev \
+                                      python3-dev \
     && apt-get purge -y --auto-remove libtiff5-dev \
                                       libfreetype6-dev \
                                       libjpeg62-turbo-dev \
diff --git a/scrapyd/onbuild/Dockerfile b/scrapyd/onbuild/Dockerfile
index ebc7170..7b63057 100644
--- a/scrapyd/onbuild/Dockerfile
+++ b/scrapyd/onbuild/Dockerfile
@@ -1,9 +1,9 @@
 #
-# Dockerfile for scrapyd-onbuild
+# Dockerfile for scrapyd-onbuild (python3)
 #
 
-FROM vimagick/scrapyd
-MAINTAINER kev <noreply@easypi.pro>
+FROM vimagick/scrapyd:py3
+MAINTAINER EasyPi Software Foundation
 
 ONBUILD ADD ./*.txt /etc/scrapyd/
 ONBUILD RUN cd /etc/scrapyd; \
diff --git a/scrapyd/py3/Dockerfile b/scrapyd/py3/Dockerfile
index 9c22831..3d2a80c 100644
--- a/scrapyd/py3/Dockerfile
+++ b/scrapyd/py3/Dockerfile
@@ -47,6 +47,7 @@ RUN set -xe \
     && echo 'source /etc/bash_completion.d/scrapy_bash_completion' >> /root/.bashrc \
     && apt-get purge -y --auto-remove autoconf \
                                       build-essential \
+                                      curl \
                                       libffi-dev \
                                       libssl-dev \
                                       libtool \