diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e0212a851..c2f97edbd2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,9 @@ jobs:
 
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: | 
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Clean workspace (very aggressive)
         if: contains(matrix.builder, 'self-hosted')
@@ -216,7 +218,9 @@ jobs:
     runs-on: ['self-hosted','ubuntu-22.04']
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Clean workspace (very aggressive)
         run: rm -rf "$GITHUB_WORKSPACE"/*
diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
index 45ab68dce4..d85a786915 100644
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -22,7 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -71,7 +73,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Install packages
         env:
@@ -128,7 +132,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Install packages
         env:
@@ -185,7 +191,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -234,7 +242,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -283,7 +293,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fix nim cache conflicts
-        run: echo "XDG_CACHE_HOME=${{ runner.temp }}/.cache" >> $GITHUB_ENV
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/.nim-cache" >> $GITHUB_ENV
+          echo "CI_CACHE=${{ runner.temp }}/.nbs-cache" >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v4