diff --git a/build.sh b/build.sh
index 5b976fe9c..4e78cf178 100755
--- a/build.sh
+++ b/build.sh
@@ -7,37 +7,51 @@ if [[ $# -ne 1 ]] ; then
   exit 1
 fi
 
-grunt release
-rm -rf /tmp/portainer-build-unix && mkdir -pv /tmp/portainer-build-unix/portainer
-mv dist/* /tmp/portainer-build-unix/portainer
-cd /tmp/portainer-build-unix && tar cvpfz portainer-${VERSION}-linux-amd64.tar.gz portainer
-cd -
+mkdir -pv /tmp/portainer-builds
 
-grunt release-win
-rm -rf /tmp/portainer-build-win && mkdir -pv /tmp/portainer-build-win/portainer
-mv dist/* /tmp/portainer-build-win/portainer
-cd /tmp/portainer-build-win
-tar cvpfz portainer-${VERSION}-windows-amd64.tar.gz portainer
+grunt release
+docker build -t portainer/portainer:linux-amd64-${VERSION} -f build/linux/Dockerfile .
+docker build -t portainer/portainer:linux-amd64 -f build/linux/Dockerfile .
+rm -rf /tmp/portainer-builds/unix && mkdir -pv /tmp/portainer-builds/unix/portainer
+mv dist/* /tmp/portainer-builds/unix/portainer
+cd /tmp/portainer-builds/unix
+tar cvpfz portainer-${VERSION}-linux-amd64.tar.gz portainer
+mv portainer-${VERSION}-linux-amd64.tar.gz /tmp/portainer-builds/
 cd -
 
 grunt release-arm
-rm -rf /tmp/portainer-build-arm && mkdir -pv /tmp/portainer-build-arm/portainer
-mv dist/* /tmp/portainer-build-arm/portainer
-cd /tmp/portainer-build-arm
+docker build -t portainer/portainer:linux-arm-${VERSION} -f build/linux/Dockerfile .
+docker build -t portainer/portainer:linux-arm -f build/linux/Dockerfile .
+rm -rf /tmp/portainer-builds/arm && mkdir -pv /tmp/portainer-builds/arm/portainer
+mv dist/* /tmp/portainer-builds/arm/portainer
+cd /tmp/portainer-builds/arm
 tar cvpfz portainer-${VERSION}-linux-arm.tar.gz portainer
+mv portainer-${VERSION}-linux-arm.tar.gz /tmp/portainer-builds/
 cd -
 
 grunt release-arm64
-rm -rf /tmp/portainer-build-arm64 && mkdir -pv /tmp/portainer-build-arm64/portainer
-mv dist/* /tmp/portainer-build-arm64/portainer
-cd /tmp/portainer-build-arm64
+docker build -t portainer/portainer:linux-arm64-${VERSION} -f build/linux/Dockerfile .
+docker build -t portainer/portainer:linux-arm64 -f build/linux/Dockerfile .
+rm -rf /tmp/portainer-builds/arm64 && mkdir -pv /tmp/portainer-builds/arm64/portainer
+mv dist/* /tmp/portainer-builds/arm64/portainer
+cd /tmp/portainer-builds/arm64
 tar cvpfz portainer-${VERSION}-linux-arm64.tar.gz portainer
+mv portainer-${VERSION}-linux-arm64.tar.gz /tmp/portainer-builds/
 cd -
 
 grunt release-macos
-rm -rf /tmp/portainer-build-darwin && mkdir -pv /tmp/portainer-build-darwin/portainer
-mv dist/* /tmp/portainer-build-darwin/portainer
-cd /tmp/portainer-build-darwin
+rm -rf /tmp/portainer-builds/darwin && mkdir -pv /tmp/portainer-builds/darwin/portainer
+mv dist/* /tmp/portainer-builds/darwin/portainer
+cd /tmp/portainer-builds/darwin
 tar cvpfz portainer-${VERSION}-darwin-amd64.tar.gz portainer
+mv portainer-${VERSION}-darwin-amd64.tar.gz /tmp/portainer-builds/
+cd -
+
+grunt release-win
+rm -rf /tmp/portainer-builds/win && mkdir -pv /tmp/portainer-builds/win/portainer
+mv dist/* /tmp/portainer-builds/win/portainer
+cd /tmp/portainer-builds/win
+tar cvpfz portainer-${VERSION}-windows-amd64.tar.gz portainer
+mv portainer-${VERSION}-windows-amd64.tar.gz /tmp/portainer-builds/
 
 exit 0