diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index e73b1a5a059d..0c407ac00ba0 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -328,6 +328,9 @@ steps:
     else
         sudo chown -R azure-pipelines:azure-pipelines ${{ parameters.pathCacheTemp }}/all
     fi
+    sudo systemctl stop docker docker.socket
+    sudo umount /var/lib/docker
+    sudo rm -rf /mnt/docker
 
   displayName: "Cache/save (${{ parameters.cacheName}})"
   condition: and(succeeded(), ne('${{ parameters.cacheName }}', ''), ne(variables.CACHE_RESTORED, 'true'))
diff --git a/.azure-pipelines/stage/checks.yml b/.azure-pipelines/stage/checks.yml
index 63882b9fa159..b4e650287a23 100644
--- a/.azure-pipelines/stage/checks.yml
+++ b/.azure-pipelines/stage/checks.yml
@@ -83,6 +83,7 @@ jobs:
       cacheName: $(CI_TARGET)
       envoyBuildFilterExample: $(ENVOY_FILTER_EXAMPLE)
       cacheTestResults: ${{ parameters.cacheTestResults }}
+      diskspaceHack: true
       managedAgent: false
       repoFetchDepth: $(REPO_FETCH_DEPTH)
       repoFetchTags: $(REPO_FETCH_TAGS)