diff --git a/scripts/binaries.mk b/scripts/binaries.mk
index 268122cc..44edc7ef 100644
--- a/scripts/binaries.mk
+++ b/scripts/binaries.mk
@@ -13,45 +13,60 @@ WORKDIR /s/internal/rpicamera
 COPY internal/rpicamera .
 RUN cd exe && make -j$$(nproc)
 
-FROM $(BASE_IMAGE)
+FROM $(BASE_IMAGE) AS build-base
 RUN apk add --no-cache zip make git tar
 WORKDIR /s
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . ./
-
 ENV VERSION $(shell git describe --tags)
 ENV CGO_ENABLED 0
 RUN rm -rf binaries
 RUN mkdir tmp binaries
 RUN cp mediamtx.yml LICENSE tmp/
 
+FROM build-base AS build-windows-amd64
 RUN GOOS=windows GOARCH=amd64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx.exe
 RUN cd tmp && zip -q ../binaries/mediamtx_$${VERSION}_windows_amd64.zip mediamtx.exe mediamtx.yml LICENSE
 
+FROM build-base AS build-linux-amd64
 RUN GOOS=linux GOARCH=amd64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx
 RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_amd64.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE
 
+FROM build-base AS build-darwin-amd64
 RUN GOOS=darwin GOARCH=amd64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx
 RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_darwin_amd64.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE
 
+FROM build-base AS build-darwin-arm64
 RUN GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx
 RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_darwin_arm64.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE
 
+FROM build-base AS build-linux-armv6
 COPY --from=rpicamera32 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/
 RUN GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera
 RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_armv6.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE
 RUN rm internal/rpicamera/exe/exe
 
+FROM build-base AS build-linux-armv7
 COPY --from=rpicamera32 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/
 RUN GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera
 RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_armv7.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE
 RUN rm internal/rpicamera/exe/exe
 
+FROM build-base AS build-linux-arm64
 COPY --from=rpicamera64 /s/internal/rpicamera/exe/exe internal/rpicamera/exe/
 RUN GOOS=linux GOARCH=arm64 go build -ldflags "-X github.com/aler9/mediamtx/internal/core.version=$$VERSION" -o tmp/mediamtx -tags rpicamera
 RUN tar -C tmp -czf binaries/mediamtx_$${VERSION}_linux_arm64v8.tar.gz --owner=0 --group=0 mediamtx mediamtx.yml LICENSE
 RUN rm internal/rpicamera/exe/exe
+
+FROM $(BASE_IMAGE)
+COPY --from=build-windows-amd64 /s/binaries /s/binaries
+COPY --from=build-linux-amd64 /s/binaries /s/binaries
+COPY --from=build-darwin-amd64 /s/binaries /s/binaries
+COPY --from=build-darwin-arm64 /s/binaries /s/binaries
+COPY --from=build-linux-armv6 /s/binaries /s/binaries
+COPY --from=build-linux-armv7 /s/binaries /s/binaries
+COPY --from=build-linux-arm64 /s/binaries /s/binaries
 endef
 export DOCKERFILE_BINARIES