diff --git a/murmur/Dockerfile b/murmur/Dockerfile.arm64v8
similarity index 95%
rename from murmur/Dockerfile
rename to murmur/Dockerfile.arm64v8
index ffd2659..e0c9bc6 100644
--- a/murmur/Dockerfile
+++ b/murmur/Dockerfile.arm64v8
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.11.2
+FROM arm64v8/alpine:latest
 
 ENV UID=991
 ENV GID=991
diff --git a/murmur/Dockerfile.service b/murmur/Dockerfile.service
deleted file mode 100644
index 819fc60..0000000
--- a/murmur/Dockerfile.service
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM asonix/murmur:test
-
-USER root
-
-CMD ["/bin/sh"]
diff --git a/murmur/build.sh b/murmur/build.sh
new file mode 100755
index 0000000..8bb5814
--- /dev/null
+++ b/murmur/build.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+TAG=$1
+
+function require() {
+    if [ "$1" = "" ]; then
+        echo "input '$2' required"
+        print_help
+        exit 1
+    fi
+}
+
+function print_help() {
+    echo "build.sh"
+    echo ""
+    echo "Usage:"
+    echo "	build.sh [tag]"
+    echo ""
+    echo "Args:"
+    echo "	tag: The tag of the built container"
+}
+
+function build_image() {
+    IMAGE=$1
+    ARCH=$2
+
+    docker build \
+        --pull \
+        --no-cache \
+        -f "Dockerfile.${ARCH}" \
+        -t "${IMAGE}:${TAG}-${ARCH}" \
+        -t "${IMAGE}:latest-${ARCH}" \
+        -t "${IMAGE}:latest" \
+        .
+
+    docker push "${IMAGE}:${TAG}-${ARCH}"
+    docker push "${IMAGE}:latest-${ARCH}"
+    docker push "${IMAGE}:latest"
+}
+
+require "$TAG" tag
+
+if ! docker run --rm -it arm64v8/alpine:latest /bin/sh -c 'echo "docker is configured correctly"'; then
+    echo "docker is not configured to run on qemu-emulated architectures, fixing will require sudo"
+    sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+fi
+
+set -xe
+
+build_image asonix/murmur arm64v8