diff --git a/CHANGELOG.md.20190330 b/CHANGELOG.md.20190330
new file mode 100644
index 00000000..d577cf2b
--- /dev/null
+++ b/CHANGELOG.md.20190330
@@ -0,0 +1 @@
+find . -iname 'dockerfile' -exec sed -i "s/FROM.*/ARG DISTRO=alpine:3.8\nFROM \$DISTRO/" '{}' \;
diff --git a/tests/build_arm.sh b/tests/build_arm.sh
new file mode 100755
index 00000000..3f85955f
--- /dev/null
+++ b/tests/build_arm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -x
+
+export DISTRO="hypriot/rpi-alpine"
+docker-compose -f build.yml build --build-arg DISTRO=$DISTRO # --parallel