diff --git a/.github/workflows/BuildImages.yml b/.github/workflows/BuildImages.yml
index f3d23b9a1..323146bed 100644
--- a/.github/workflows/BuildImages.yml
+++ b/.github/workflows/BuildImages.yml
@@ -53,6 +53,14 @@ jobs:
       matrix:
         config: ${{ fromJson(needs.setup.outputs.matrix) }}
     steps:
+      - name: Cache aptitude
+        uses: actions/cache@v2
+        with:
+          path: repository/src/workspace/aptcache
+          key: ${{ runner.os }}-apt-get-${{ hashFiles('**/apt.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-apt-get-
+
       - name: Build image
         id: build
         uses: mainsail-crew/MainsailOS-actions/build-image@master
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 1af5ce3d3..6b616965d 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -116,6 +116,14 @@ jobs:
       matrix:
         config: ${{ fromJson(needs.matrix.outputs.matrix) }}
     steps:
+      - name: Cache aptitude
+        uses: actions/cache@v2
+        with:
+          path: repository/src/workspace/aptcache
+          key: ${{ runner.os }}-apt-get-${{ hashFiles('**/apt.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-apt-get-
+
       - name: Build image
         id: build
         uses: mainsail-crew/MainsailOS-actions/build-image@master
diff --git a/config/default b/config/default
index ba175730f..c111b217e 100644
--- a/config/default
+++ b/config/default
@@ -28,6 +28,7 @@ BASE_ZIP_IMG="$(get_img_name)"
 DIST_NAME="RatOS"
 BASE_IMAGE_ENLARGEROOT=6500
 BASE_IMAGE_RESIZEROOT=600
+BASE_APT_CLEAN=no
 
 # export Variables
 export DIST_NAME
@@ -36,3 +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
diff --git a/config/raspberry/default b/config/raspberry/default
index 0ea31c58a..67de684d9 100644
--- a/config/raspberry/default
+++ b/config/raspberry/default
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Shebang for better file detection
 
-BASE_IMAGE_ENLARGEROOT=6500
+BASE_IMAGE_ENLARGEROOT=10500
 BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
 BASE_RELEASE_COMPRESS=no