diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d629f8be..d50f444e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -157,6 +157,16 @@ jobs:
       matrix: ${{fromJson(needs.setup_flatpak_matrix.outputs.matrix)}}
 
     steps:
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@v7
+        with:
+          root-reserve-mb: 10240
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'false'
+
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -178,13 +188,6 @@ jobs:
             org.freedesktop.Sdk.Extension.node18/${{ matrix.arch }}/${PLATFORM_VERSION} \
             "
 
-      - name: Create Additional Disk Space
-        run: |
-          df -h
-          sudo rm -rf /usr/share/dotnet
-          sudo docker rmi $(docker images -a -q)
-          df -h
-
       - name: Cache Flatpak build
         uses: actions/cache@v3
         with:
@@ -273,6 +276,16 @@ jobs:
             dist: 20.04
 
     steps:
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@v7
+        with:
+          root-reserve-mb: 20480
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'false'
+
       - name: Checkout
         uses: actions/checkout@v3
         with: