diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 2920636..2c76062 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .lake/build
-          key: build-artifacts-${{ hashFiles('lake-manifest.json') }}
+          key: build-artifacts-${{ runner.os }}-${{ hashFiles('lake-manifest.json') }}
           restore-keys: |
             build-artifacts-
 
@@ -77,7 +77,9 @@ jobs:
       - name: Cache apt packages
         uses: actions/cache@v3
         with:
-          path: /var/cache/apt
+          path: |
+            /var/cache/apt/archives
+            !/var/cache/apt/archives/partial
           key: apt-cache-${{ runner.os }}-${{ hashFiles('blueprint/requirements.txt') }}
           restore-keys: |
             apt-cache-${{ runner.os }}-
@@ -85,7 +87,10 @@ jobs:
       - name: Cache apt package lists
         uses: actions/cache@v3
         with:
-          path: /var/lib/apt/lists
+          path: |
+            /var/lib/apt/lists
+            !/var/lib/apt/lists/partial
+            !/var/lib/apt/lists/lock
           key: apt-lists-${{ runner.os }}-${{ hashFiles('blueprint/requirements.txt') }}
           restore-keys: |
             apt-lists-${{ runner.os }}-
@@ -99,7 +104,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: blueprint-dependencies-${{ hashFiles('blueprint/requirements.txt') }}
+          key: blueprint-dependencies-${{ runner.os }}-${{ hashFiles('blueprint/requirements.txt') }}
           restore-keys: |
             blueprint-dependencies- # Cache Python dependencies for blueprint