diff --git a/.github/workflows/BuildImages.yml b/.github/workflows/BuildImages.yml
index 323146bed..dcc78914c 100644
--- a/.github/workflows/BuildImages.yml
+++ b/.github/workflows/BuildImages.yml
@@ -57,9 +57,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: repository/src/workspace/aptcache
-          key: ${{ runner.os }}-apt-get-${{ hashFiles('**/apt.txt') }}
+          key: ${{ matrix.config }}-apt-get-${{ hashFiles('**/apt.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-get-
+            ${{ matrix.config }}-apt-get-
 
       - name: Build image
         id: build
diff --git a/config/default b/config/default
index c111b217e..f7f44e1a4 100644
--- a/config/default
+++ b/config/default
@@ -37,4 +37,4 @@ export BASE_ZIP_IMG
 export BASE_IMAGE_ENLARGEROOT
 export BASE_IMAGE_RESIZEROOT
 export BASE_BOOT_MOUNT_PATH
-export BASE_APT_CLEAN
\ No newline at end of file
+export BASE_APT_CLEAN