diff --git a/package.json b/package.json
index a9f02e89..4eae3ffb 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "build:32": "docker build --no-cache -f arm32v7.Dockerfile -t apotdevin/thunderhub:test-arm32v7 .",
     "build:64": "docker build -f arm64v8.Dockerfile -t apotdevin/thunderhub:test-arm64v8 .",
     "build:manifest": "docker manifest create apotdevin/thunderhub:test apotdevin/thunderhub:test-amd64 apotdevin/thunderhub:test-arm32v7 apotdevin/thunderhub:test-arm64v8",
+    "build:all": "sh ./scripts/buildAllImages.sh",
     "upgrade-latest": "npx npm-check -u",
     "tsc": "tsc",
     "update": "sh ./scripts/updateToLatest.sh"
diff --git a/scripts/buildAllImages.sh b/scripts/buildAllImages.sh
new file mode 100644
index 00000000..c76c7d83
--- /dev/null
+++ b/scripts/buildAllImages.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+REPO=apotdevin/thunderhub
+VERSION=0.7.1
+
+docker build --pull -t $REPO:$VERSION-amd64 -f Dockerfile .
+docker push $REPO:$VERSION-amd64
+
+docker build --pull -t $REPO:$VERSION-arm32v7 -f arm32v7.Dockerfile .
+docker push $REPO:$VERSION-arm32v7
+
+docker build --pull -t $REPO:$VERSION-arm64v8 -f arm64v8.Dockerfile .
+docker push $REPO:$VERSION-arm64v8
+
+docker manifest create --amend $REPO:$VERSION $REPO:$VERSION-amd64 $REPO:$VERSION-arm32v7 $REPO:$VERSION-arm64v8
+docker manifest annotate $REPO:$VERSION $REPO:$VERSION-amd64 --os linux --arch amd64
+docker manifest annotate $REPO:$VERSION $REPO:$VERSION-arm32v7 --os linux --arch arm --variant v7
+docker manifest annotate $REPO:$VERSION $REPO:$VERSION-arm64v8 --os linux --arch arm64 --variant v8
+docker manifest push $REPO:$VERSION -p
\ No newline at end of file