diff --git a/.github/workflows/dockerarm.yml b/.github/workflows/dockerarm.yml
new file mode 100644
index 0000000..15b012c
--- /dev/null
+++ b/.github/workflows/dockerarm.yml
@@ -0,0 +1,9 @@
+name: Build bitcoind on arm
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Build the Docker image
+        run: docker build . --file 0.18/source/Dockerfile --tag bitcoind:arm-$(date +%s)
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 78e43e7..394f4e4 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -1,13 +1,8 @@
 name: Build bitcoind on amd64
-
 on: [push]
-
 jobs:
-
   build:
- 
     runs-on: ubuntu-latest
- 
     steps:
     - uses: actions/checkout@master
     - name: Build the Docker image
diff --git a/0.18/source/Dockerfile b/0.18/source/Dockerfile
index 8941826..7130578 100644
--- a/0.18/source/Dockerfile
+++ b/0.18/source/Dockerfile
@@ -1,8 +1,8 @@
 # Build stage for Bitcoin Core
-FROM alpine:3.9 AS bitcoin-core
+FROM arm32v7/alpine:3.10 AS bitcoin-core
 
 # fetch already built berkeleydb
-COPY --from=lncm/berkeleydb:db-4.8.30.NC /opt /opt
+COPY --from=lncm/berkeleydb:db-4.8.30.NC-linux-arm /opt /opt
 
 # Use APK repos over HTTPS. See: https://github.com/gliderlabs/docker-alpine/issues/184
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
@@ -84,7 +84,7 @@ RUN strip ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.so.0.0.0
 
 
 # Build stage for compiled artifacts
-FROM alpine:3.9 AS final
+FROM arm32v7/alpine:3.10 AS final
 
 LABEL maintainer.0="nolim1t (@nolim1t)" \
       maintainer.1="Damian Mee (@meeDamian)"