diff --git a/Makefile b/Makefile
index f52a116..9f4f62a 100644
--- a/Makefile
+++ b/Makefile
@@ -71,11 +71,18 @@ package-zip: extract-licenses
        zip -ur $$BUILD.zip ${LICENSE_DIR}; \
     done
 
-build-docker: require-version
+build-docker-amd64: require-version
 	cp ${BUILD_DIR}/gotify-linux-amd64 ./docker/gotify-app
 	(cd ${DOCKER_DIR} && docker build -t gotify/server:latest -t gotify/server:${VERSION} .)
 	rm ${DOCKER_DIR}gotify-app
 
+build-docker-arm-7: require-version
+	cp ${BUILD_DIR}/gotify-linux-arm-7 ./docker/gotify-app
+	(cd ${DOCKER_DIR} && docker build -f Dockerfile.armv7 -t gotify/server-arm7:latest -t gotify/server-arm7:${VERSION} .)
+	rm ${DOCKER_DIR}gotify-app
+
+build-docker: build-docker-amd64 build-docker-arm-7
+
 build-js:
 	(cd ui && yarn build)
 
diff --git a/docker-push.sh b/docker-push.sh
index 9902215..17aaf6e 100644
--- a/docker-push.sh
+++ b/docker-push.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
 docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
-docker push gotify/server
\ No newline at end of file
+docker push gotify/server
+docker push gotify/server-arm7
diff --git a/docker/Dockerfile.armv7 b/docker/Dockerfile.armv7
new file mode 100644
index 0000000..d565d39
--- /dev/null
+++ b/docker/Dockerfile.armv7
@@ -0,0 +1,4 @@
+FROM arm32v7/debian
+WORKDIR /app
+ADD gotify-app /app/
+ENTRYPOINT ["./gotify-app"]