diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0cfeed81..533b0868b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,10 +34,7 @@ jobs:
         include:
           - os: 22.04
             ghc: "8.10.7"
-            platform_name: 20_04-x86-64
-          - os: 20.04
-            ghc: "9.6.3"
-            platform_name: 20_04-x86-64
+            platform_name: 22_04-8.10.7
           - os: 22.04
             ghc: "9.6.3"
             platform_name: 22_04-x86-64
@@ -48,17 +45,54 @@ jobs:
       - name: Clone project
         uses: actions/checkout@v3
 
-      - name: Prepare image
-        shell: bash
-        run: docker build -f Dockerfile.build --build-arg TAG=${{ matrix.os }} --build-arg GHC=${{ matrix.ghc }} -t local .
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and cache Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          load: true
+          file: Dockerfile.build
+          tags: build/${{ matrix.platform_name }}:latest
+          cache-from: |
+            type=gha
+            type=gha,scope=master
+          cache-to: type=gha,mode=max
+          build-args: |
+            TAG=${{ matrix.os }}
+            GHC=${{ matrix.ghc }}
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cabal/store
+            dist-newstyle
+          key: ${{ matrix.os }}-${{ hashFiles('cabal.project', 'simplexmq.cabal') }}
 
       - name: Start container
         shell: bash
-        run: docker run -t -d --name builder local
+        run: |
+          docker run -t -d \
+            --name builder \
+            -v ~/.cabal:/root/.cabal \
+            -v /home/runner/work/_temp:/home/runner/work/_temp \
+            -v ${{ github.workspace }}:/project \
+            build/${{ matrix.platform_name }}:latest
 
       - name: Build smp-server (postgresql) and tests
-        shell: bash
-        run: docker exec -t builder sh -c 'cabal build --enable-tests -fserver_postgres && mkdir -p /out &&  for i in smp-server simplexmq-test; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable); chmod +x "$bin"; mv "$bin" /out/; done; strip /out/smp-server'
+        shell: docker exec -t builder sh {0}
+        run: |
+          cabal update
+          cabal build --enable-tests -fserver_postgres
+          mkdir -p /out
+          for i in smp-server simplexmq-test; do
+            bin=$(find /project/dist-newstyle -name "$i" -type f -executable)
+            chmod +x "$bin"
+            mv "$bin" /out/
+          done
+          strip /out/smp-server
 
       - name: Copy simplexmq-test from container
         shell: bash
@@ -72,15 +106,23 @@ jobs:
           docker cp builder:/out/smp-server ./smp-server-postgres-ubuntu-${{ matrix.platform_name }}
 
       - name: Build everything else (standard)
-        shell: bash
-        run: docker exec -t -e apps="$apps" builder sh -c 'cabal build && mkdir -p /out && for i in $apps; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable); strip "$bin"; chmod +x "$bin"; mv "$bin" /out/; done'
+        shell: docker exec -t builder sh {0}
+        run: |
+          cabal build
+          mkdir -p /out
+          for i in ${{ env.apps }}; do
+            bin=$(find /project/dist-newstyle -name "$i" -type f -executable)
+            strip "$bin"
+            chmod +x "$bin"
+            mv "$bin" /out/
+          done
 
       - name: Copy binaries from container and prepare them
         if: startsWith(github.ref, 'refs/tags/v')
         shell: bash
         run: |
           docker cp builder:/out .
-          for i in $apps; do mv ./out/$i ./$i-ubuntu-${{ matrix.platform_name }}; done
+          for i in ${{ env.apps }}; do mv ./out/$i ./$i-ubuntu-${{ matrix.platform_name }}; done
 
       - name: Build changelog
         if: startsWith(github.ref, 'refs/tags/v')
diff --git a/Dockerfile.build b/Dockerfile.build
index c7ddea11d..c3dc55301 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -28,15 +28,4 @@ ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
 RUN ghcup set ghc "${GHC}" && \
     ghcup set cabal "${CABAL}"
 
-# Copy only the source code
-COPY apps /project/apps/
-COPY cbits /project/cbits/
-COPY src /project/src/
-COPY tests /project/tests/
-
-COPY cabal.project Setup.hs simplexmq.cabal LICENSE /project
-
 WORKDIR /project
-
-# Compile app
-RUN cabal update
diff --git a/scripts/reproduce-builds.sh b/scripts/reproduce-builds.sh
index eb35287ae..be8a910ba 100755
--- a/scripts/reproduce-builds.sh
+++ b/scripts/reproduce-builds.sh
@@ -1,30 +1,81 @@
 #!/usr/bin/env sh
 set -eu
 
-tag="$1"
+TAG="$1"
 
-git clone https://github.com/simplex-chat/simplexmq && cd simplexmq
+tempdir="$(mktemp -d)"
+init_dir="$PWD"
 
-git checkout "$tag"
+mkdir -p "$init_dir/$TAG/from-source" "$init_dir/$TAG/prebuilt"
+
+git -C "$tempdir" clone https://github.com/simplex-chat/simplexmq.git &&\
+	cd "$tempdir/simplexmq" &&\
+	git checkout "$TAG"
 
 for os in 20.04 22.04 24.04; do
-	mkdir -p out-${os}-github;
+	os_url="$(printf '%s' "$os" | tr '.' '_')"
+	mkdir -p "$init_dir/cache/cabal/builder-${os}" "$init_dir/cache/dist-newstyle/builder-${os}"
+	chmod g+wX "$init_dir/cache"
 
-	docker build -f Dockerfile.build --build-arg TAG=${os} -t repro-${os} .
-	docker run -t -d --name builder-${os} repro-${os}
+	docker build \
+		--no-cache \
+		-f "$tempdir/simplexmq/Dockerfile.build" \
+		--build-arg TAG=${os} \
+		-t repro-${os} \
+		.
+
+	docker run \
+		-t \
+		-d \
+		-v "$init_dir/cache/cabal/builder-${os}:/root/.cabal" \
+		-v "$init_dir/cache/dist-newstyle/builder-${os}:/dist-newstyle" \
+		-v "$tempdir/simplexmq:/project" \
+		--name builder-${os} \
+		repro-${os}
+	
 	
 	apps='smp-server xftp-server ntf-server xftp'
-	os_url="$(printf '%s' "$os" | tr '.' '_')"
-	
-	docker exec -t -e apps="$apps" builder-${os} sh -c 'cabal build && mkdir /out && for i in $apps; do bin=$(find /project/dist-newstyle -name "$i" -type f -executable); strip "$bin"; chmod +x "$bin"; mv "$bin" /out/; done'
 
-	docker cp builder-${os}:/out out-${os}
+	# Regular build (all)
+	docker exec \
+		-t \
+		-e apps="$apps" \
+		builder-${os} \
+		sh -c 'ln -fs /dist-newstyle ./dist-newstyle && cabal update && cabal build && mkdir -p /out && for i in $apps; do bin=$(find /dist-newstyle -name "$i" -type f -executable); strip "$bin"; chmod +x "$bin"; mv "$bin" /out/; done'
+
+	docker cp \
+		builder-${os}:/out \
+		out-${os}
+
+	# PostgreSQL build (only smp-server)
+	docker exec \
+		-t \
+		builder-${os} \
+		sh -c 'ln -fs /dist-newstyle ./dist-newstyle && cabal update && cabal build -fserver_postgres exe:smp-server && mkdir -p /out && bin=$(find /dist-newstyle -name "smp-server" -type f -executable); strip "$bin"; chmod +x "$bin"; mv "$bin" /out/'
+
+	docker cp \
+		builder-${os}:/out/smp-server \
+		"$init_dir/$TAG/from-source/smp-server-postgres-ubuntu-${os_url}-x86-64"
+
+	curl -L \
+		--output-dir "$init_dir/$TAG/prebuilt/" \
+		-O \
+		"https://github.com/simplex-chat/simplexmq/releases/download/${TAG}/smp-server-postgres-ubuntu-${os_url}-x86-64"
 	
 	for app in $apps; do
-		curl -L "https://github.com/simplex-chat/simplexmq/releases/download/${tag}/${app}-ubuntu-${os_url}-x86-64" -o out-${os}-github/${app}
+		curl -L \
+			--output-dir "$init_dir/$TAG/prebuilt/" \
+			-O \
+		       	"https://github.com/simplex-chat/simplexmq/releases/download/${TAG}/${app}-ubuntu-${os_url}-x86-64"
+
+		mv "./out-${os}/$app" "$init_dir/$TAG/from-source/${app}-ubuntu-${os_url}-x86-64"
 	done
 
 	docker stop builder-${os}
 	docker rm builder-${os} 
 	docker image rm repro-${os}
 done
+
+# Cleanup
+cd "$init_dir"
+rm -rf "$tempdir"