diff --git a/hydra/Dockerfile b/hydra/Dockerfile
index 38dda04..1c1ac8c 100644
--- a/hydra/Dockerfile
+++ b/hydra/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 FROM alpine
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apk add --no-cache apr-dev \
@@ -22,8 +22,6 @@ RUN set -xe \
                           mariadb-libs \
                           ncurses \
                           ncurses-dev \
-                          openssl \
-                          openssl-dev \
                           parallel \
                           pcre \
                           pcre-dev \
@@ -33,7 +31,7 @@ RUN set -xe \
     && echo 'will cite' | parallel --bibtex \
     && mkdir src \
         && cd src \
-        && git clone https://github.com/vanhauser-thc/thc-hydra.git . \
+        && git clone --depth 1 https://github.com/vanhauser-thc/thc-hydra.git . \
         && ./configure --prefix=/usr \
         && make install \
         && cd .. \
@@ -45,12 +43,11 @@ RUN set -xe \
                        libssh-dev \
                        ncurses-dev \
                        mariadb-dev \
-                       openssl-dev \
                        pcre-dev \
                        postgresql-dev \
                        subversion-dev
 
-VOLUME /work
-WORKDIR /work
+VOLUME /hydra
+WORKDIR /hydra
 
 CMD ["bash"]
diff --git a/hydra/arm/Dockerfile b/hydra/arm/Dockerfile
new file mode 100644
index 0000000..e8b460b
--- /dev/null
+++ b/hydra/arm/Dockerfile
@@ -0,0 +1,53 @@
+#
+# Dockerfile for hydra-arm
+#
+
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
+
+RUN set -xe \
+    && apk add --no-cache apr-dev \
+                          apr-util-dev \
+                          bash \
+                          build-base \
+                          curl \
+                          git \
+                          jq \
+                          libidn \
+                          libidn-dev \
+                          libpq \
+                          libssh \
+                          libssh-dev \
+                          mariadb-dev \
+                          mariadb-libs \
+                          ncurses \
+                          ncurses-dev \
+                          parallel \
+                          pcre \
+                          pcre-dev \
+                          postgresql-dev \
+                          subversion-dev \
+                          subversion-libs \
+    && echo 'will cite' | parallel --bibtex \
+    && mkdir src \
+        && cd src \
+        && git clone --depth 1 https://github.com/vanhauser-thc/thc-hydra.git . \
+        && ./configure --prefix=/usr \
+        && make install \
+        && cd .. \
+        && rm -rf src \
+    && apk del --purge apr-dev \
+                       apr-util-dev \
+                       build-base \
+                       libidn-dev \
+                       libssh-dev \
+                       ncurses-dev \
+                       mariadb-dev \
+                       pcre-dev \
+                       postgresql-dev \
+                       subversion-dev
+
+VOLUME /hydra
+WORKDIR /hydra
+
+CMD ["bash"]