diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index af0f185e45..724b675d48 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -35,13 +35,13 @@ jobs:
     name: ${{ matrix.env.IMAGE }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: cache upstream_ws
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
-          save-always: true
+          id: cache-primes-restore
           path: ${{ env.BASEDIR }}/upstream_ws
           key: upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('.github/upstream.repos') }}-${{ github.run_id }}
           restore-keys: |
@@ -49,17 +49,17 @@ jobs:
       # The target directory cache doesn't include the source directory because
       # that comes from the checkout.  See "prepare target_ws for cache" task below
       - name: cache target_ws
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
-          save-always: true
+          id: cache-primes-restore
           path: ${{ env.BASEDIR }}/target_ws
           key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }}
           restore-keys: |
             target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
       - name: cache ccache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
-          save-always: true
+          id: cache-primes-restore
           path: ${{ env.CCACHE_DIR }}
           key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
           restore-keys: |
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 96777f2236..45493f7584 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,7 +19,7 @@ jobs:
     container:
       image: moveit/moveit2:rolling-source
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Install Python dependencies
       shell: bash
@@ -59,7 +59,7 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Install Python dependencies
       shell: bash
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: upload_site_artifacts
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0