diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d0f1c90..b16c42df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,8 +26,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21'
-          distribution: 'liberica'
+          # Oracle GraalVM for JDK 21.0.5, as in release-cli.yml. Pinned through java-version: the action then downloads
+          # it from download.oracle.com/graalvm/21/archive/. (`version:` only looks among the 10 newest GDS builds, so
+          # an older pin stops resolving; unpinned Liberica broke when its 21.0.13 assets were named 21.0.13.0.3+6.)
+          java-version: '21.0.5'
+          distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Get Tag from version file
         run: |
diff --git a/.github/workflows/dev-release-cli.yml b/.github/workflows/dev-release-cli.yml
index a6aec125..c481016a 100644
--- a/.github/workflows/dev-release-cli.yml
+++ b/.github/workflows/dev-release-cli.yml
@@ -22,10 +22,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21'
+          # Pinned through java-version (downloaded from download.oracle.com/graalvm/21/archive/). `version: '21.0.5'`
+          # no longer resolves: the action only looks among the 10 newest GDS builds.
+          java-version: '21.0.5'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          version: '21.0.5'
           native-image-job-reports: 'true'
       - name: Get Tag from version file
         run: |
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 9882b98f..b869e8e5 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -20,10 +20,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21'
+          # Pinned through java-version (downloaded from download.oracle.com/graalvm/21/archive/). `version: '21.0.5'`
+          # no longer resolves: the action only looks among the 10 newest GDS builds.
+          java-version: '21.0.5'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          version: '21.0.5'
           native-image-job-reports: 'true'
       - name: Get Tag from version file
         run: |
diff --git a/applications/cli/src/main/java/com/bloxbean/cardano/yacicli/localcluster/yacistore/YaciStoreConfigBuilder.java b/applications/cli/src/main/java/com/bloxbean/cardano/yacicli/localcluster/yacistore/YaciStoreConfigBuilder.java
index f9bb3894..de23676b 100644
--- a/applications/cli/src/main/java/com/bloxbean/cardano/yacicli/localcluster/yacistore/YaciStoreConfigBuilder.java
+++ b/applications/cli/src/main/java/com/bloxbean/cardano/yacicli/localcluster/yacistore/YaciStoreConfigBuilder.java
@@ -79,6 +79,12 @@ public boolean build(ClusterInfo clusterInfo, String txEvaluatorMode) {
 
         storeProperties.put("store.live.enabled", "true");
 
+        // Keep raw tx CBOR (/api/v1/txs/{hash}/cbor). The store saves only what the parser returns, and the parser
+        // returns body CBOR only when return-tx-body-cbor is set, so both are needed. Yaci Store 2.0.x saves the
+        // body bytes, not the whole transaction (no witnesses).
+        storeProperties.put("store.cardano.return-tx-body-cbor", "true");
+        storeProperties.put("store.transaction.save-cbor", "true");
+
         if (yanoOnly) {
             // Explicitly disable N2C-based local epoch endpoint — no Haskell node socket in yano-only mode.
             // The n2c profile (baked into Yaci Store binary) sets this to true by default,
diff --git a/applications/store-build/Earthfile b/applications/store-build/Earthfile
index 32825389..bbc32f7f 100644
--- a/applications/store-build/Earthfile
+++ b/applications/store-build/Earthfile
@@ -12,6 +12,9 @@ store-native:
   RUN git clone --depth 1 --branch ${STORE_BRANCH} https://github.com/bloxbean/yaci-store.git yaci-store
 
   RUN git --git-dir yaci-store/.git rev-parse --short HEAD > yaci-store/store.git.properties
+  # The Gradle wrapper gives up after 10 s without data (its default networkTimeout), which a slow
+  # services.gradle.org download on CI runners regularly hits. Allow 2 minutes.
+  RUN echo "networkTimeout=120000" >> yaci-store/gradle/wrapper/gradle-wrapper.properties
 
   FROM ghcr.io/graalvm/graalvm-community:21