diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08cf5ad551..961bed53da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,8 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # pin@v2
+        with:
+          gradle-home-cache-cleanup: true
 
       - name: Run Tests with coverage and Lint
         run: make preMerge
diff --git a/.github/workflows/integration-tests-ui.yml b/.github/workflows/integration-tests-ui.yml
index 5d3d98df50..1e9bcca619 100644
--- a/.github/workflows/integration-tests-ui.yml
+++ b/.github/workflows/integration-tests-ui.yml
@@ -65,3 +65,5 @@ jobs:
           else
             exit 1
           fi
+        if: env.SAUCE_USERNAME != null
+