diff --git a/.github/workflows/therock-ci-linux.yml b/.github/workflows/therock-ci-linux.yml
index f9aba239bf5..3a3d6353bf6 100644
--- a/.github/workflows/therock-ci-linux.yml
+++ b/.github/workflows/therock-ci-linux.yml
@@ -26,8 +26,7 @@ jobs:
       fail-fast: true
     env:
       CACHE_DIR: ${{ github.workspace }}/.container-cache
-      CCACHE_DIR: "${{ github.workspace }}/.container-cache/ccache"
-      CCACHE_MAXSIZE: "700M"
+      CCACHE_CONFIGPATH: ${{ github.workspace }}/.ccache/ccache.conf
       AMDGPU_FAMILIES: "gfx94X-dcgpu"
       TEATIME_FORCE_INTERACTIVE: 0
     steps:
@@ -52,14 +51,22 @@ jobs:
         with:
           repository: "ROCm/TheRock"
           path: "TheRock"
-          ref: 5682f361d81bd53dbf677ed678539688a856a54f
+          ref: 85c8db9207bdd8b7e917cdd5cbf7f9f86b0ef62d
 
       - name: Runner Health Settings
         run: |
-          echo "CCACHE_DIR=${CCACHE_DIR}"
+          ./TheRock/build_tools/setup_ccache.py \
+            --config-preset "github-oss-presubmit" \
+            --dir "$(dirname $CCACHE_CONFIGPATH)" \
+            --local-path "$CACHE_DIR/ccache"
           df -h
+          echo "ccache version: $(ccache --version)"
+          echo "ccache config:"
+          echo "---"
+          cat "$CCACHE_CONFIGPATH"
+          echo "---"
           ccache -z
-          mkdir -p $CCACHE_DIR
+          ccache -s -v
           cmake --version
           echo "Installed Python versions:"
           ls -d /opt/python
@@ -67,7 +74,7 @@ jobs:
           echo "Git version: $(git --version)"
           git config --global --add safe.directory $PWD
           git config fetch.parallel 10
-      
+
       - name: Fetch sources
         run: |
           ./TheRock/build_tools/fetch_sources.py --jobs 12 --no-include-math-libs
@@ -106,7 +113,8 @@ jobs:
           du -h -d 1 TheRock/build/artifacts
           echo "CCache Stats:"
           echo "-------------"
-          ccache -s
+          ccache -s -v
+          tail -v -n +1 .ccache/compiler_check_cache/* > TheRock/build/logs/ccache_compiler_check_cache.log
 
       - name: Configure AWS Credentials
         if: always()
@@ -115,6 +123,12 @@ jobs:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::692859939525:role/therock-artifacts-external
 
+      - name: Create Log archive
+        if: always()
+        run: |
+          python3 TheRock/build_tools/create_log_archive.py \
+            --build-dir=TheRock/build
+
       - name: Create Logs index Files
         if: always()
         run: |
diff --git a/.github/workflows/therock-ci-windows.yml b/.github/workflows/therock-ci-windows.yml
index 464ffff85f8..0df5bfeb9d0 100644
--- a/.github/workflows/therock-ci-windows.yml
+++ b/.github/workflows/therock-ci-windows.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           repository: "ROCm/TheRock"
           path: "TheRock"
-          ref: 5682f361d81bd53dbf677ed678539688a856a54f
+          ref: 85c8db9207bdd8b7e917cdd5cbf7f9f86b0ef62d
 
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -138,6 +138,12 @@ jobs:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::692859939525:role/therock-artifacts-external
 
+      - name: Create Log archive
+        if: always()
+        run: |
+          python3 TheRock/build_tools/create_log_archive.py \
+            --build-dir=${{ env.BUILD_DIR }}
+
       - name: Create Logs index Files
         if: always()
         run: |