diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b23ed3c..5a4cf4d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,22 +13,22 @@ jobs:
   build:
     strategy:
       matrix:
-        # The "reproducible" entry is used to build the project with the LTS Java version used in reproducible builds script.
+        # java="25" is the LTS Java version used in reproducible builds script (default in Containerfile).
         # More Java versions can be added to test compatibility, eg. "26".
-        java: ["reproducible", "26"]
+        java: ["25", "26"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - name: Build
         run: |
-          if [ "${{ matrix.java }}" != "reproducible" ]; then
+          if [ "${{ matrix.java }}" != "25" ]; then
             export OVERRIDE_JAVA_VERSION="${{ matrix.java }}"
           fi
           ./reproducible-builds/build.sh
       - name: Upload build artifacts
         uses: actions/upload-artifact@v7
         with:
-          name: signal-cli-${{ matrix.java }}-${{ github.job }}
+          name: signal-cli-archive-${{ matrix.java }}
           path: dist/*
 
   build-client:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a18b953f..621581f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,11 @@ env:
   IMAGE_REGISTRY: ghcr.io/asamk
   REGISTRY_USER: ${{ github.actor }}
   REGISTRY_PASSWORD: ${{ github.token }}
+  ARCHIVE_JAVA_VERSION: 25
 
 jobs:
   build:
-    uses: AsamK/signal-cli/.github/workflows/build.yml@master
+    uses: ./.github/workflows/build.yml
 
   release:
     needs: build
@@ -31,7 +32,7 @@ jobs:
       - name: Get signal-cli version
         id: version
         run: |
-          mv ./signal-cli-reproducible-build/* .
+          mv ./signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/* .
           echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
 
       - name: Create release
@@ -87,7 +88,7 @@ jobs:
 
       - name: Move archive file
         run: |
-          tar xf ./signal-cli-reproducible-build/signal-cli-${{ needs.release.outputs.version }}.tar.gz
+          tar xf signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/signal-cli-${{ needs.release.outputs.version }}.tar.gz
           mkdir -p build/install/
           mv ./signal-cli-"${{ needs.release.outputs.version }}"/ build/install/signal-cli
 
@@ -127,7 +128,7 @@ jobs:
 
       - name: Move archive file
         run: |
-          tar xf ./signal-cli-reproducible-build/signal-cli-${{ needs.release.outputs.version }}-Linux-native.tar.gz
+          tar xf signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/signal-cli-${{ needs.release.outputs.version }}-Linux-native.tar.gz
           mkdir -p build/native/nativeCompile/
           mv signal-cli build/native/nativeCompile/
           chmod +x build/native/nativeCompile/signal-cli
@@ -168,7 +169,7 @@ jobs:
 
       - name: Move archive file
         run: |
-          tar xf ./signal-cli-reproducible-build/signal-cli-${{ needs.release.outputs.version }}-Linux-client.tar.gz
+          tar xf signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/signal-cli-${{ needs.release.outputs.version }}-Linux-client.tar.gz
           mkdir -p client/target/release/
           mv signal-cli-client client/target/release/
           chmod +x client/target/release/signal-cli-client