diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml
index f40f3faff9..2d9197fe1c 100644
--- a/.github/workflows/ci-tests.yaml
+++ b/.github/workflows/ci-tests.yaml
@@ -56,7 +56,7 @@ jobs:
               uses: actions/cache/restore@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all-${{ env.date }}
+                  key: testlib-build-all-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-all
 
@@ -126,7 +126,7 @@ jobs:
               if: ${{ endsWith(matrix.build-target, 'build/ALL/gem5.opt') }}
               with:
                   path: build/ALL
-                  key: testlib-build-all-${{ env.date }}
+                  key: testlib-build-all-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-all
 
@@ -250,7 +250,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/VEGA_X86
-                  key: testlib-build-vega-${{ env.date }}
+                  key: testlib-build-vega-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-vega
 
diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml
index 584cce0d90..a707bd7d6c 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -11,6 +11,8 @@ jobs:
 
     get-date:
         runs-on: ubuntu-latest
+        outputs:
+            date: ${{ steps.date.outputs.date }}
         steps:
             - name: Get the current date
               id: date
@@ -31,7 +33,7 @@ jobs:
               uses: actions/cache/restore@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all-${{ env.date }}
+                  key: testlib-build-all-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-all
             - name: ALL/unittests.${{ matrix.type }} UnitTests
@@ -57,13 +59,13 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/NULL
-                  key: testlib-build-null-${{ env.date }}
+                  key: testlib-build-null-${{ needs.get-date.outputs.date }}
 
             - name: Restore build/ALL cache
               uses: actions/cache@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all-${{ env.date }}
+                  key: testlib-build-all-${{ needs.get-date.outputs.date }}
 
             - name: long ${{ matrix.test-type }} tests
               working-directory: ${{ github.workspace }}/tests
@@ -101,7 +103,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all-${{ env.date }}
+                  key: testlib-build-all-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-all
 
@@ -135,7 +137,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/VEGA_X86
-                  key: testlib-build-vega-${{ env.date }}
+                  key: testlib-build-vega-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-vega
 
diff --git a/.github/workflows/weekly-tests.yaml b/.github/workflows/weekly-tests.yaml
index 6baec1fa68..ec0797dcdc 100644
--- a/.github/workflows/weekly-tests.yaml
+++ b/.github/workflows/weekly-tests.yaml
@@ -11,6 +11,8 @@ jobs:
 
     get-date:
         runs-on: ubuntu-latest
+        outputs:
+            date: ${{ steps.date.outputs.date }}
         steps:
             - name: Get the current date
               id: date
@@ -35,7 +37,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all-${{ env.date }}
+                  key: testlib-build-all-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-all
 
@@ -68,7 +70,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/VEGA_X86
-                  key: testlib-build-vega-${{ env.date }}
+                  key: testlib-build-vega-${{ needs.get-date.outputs.date }}
                   restore-keys: |
                       testlib-build-vega