diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 4e1f2564..57897618 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -30,10 +30,10 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.4
+        uses: malinskiy/action-android/install-sdk@release/0.1.6
 
       - name: Run quality checks
         run: ./gradlew --build-cache check --stacktrace
@@ -66,8 +66,15 @@ jobs:
           distribution: 'zulu'
           java-version: 17
 
-      - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: false
 
       - name: Compile instrumented tests
         run: ./gradlew --build-cache assembleDebugAndroidTest
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 1aef3a68..3a2cbb07 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -26,10 +26,10 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.4
+        uses: malinskiy/action-android/install-sdk@release/0.1.6
 
       - name: Run quality checks
         run: ./gradlew --build-cache check --stacktrace
@@ -62,8 +62,15 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: false
 
       - name: Compile instrumented tests
         run: ./gradlew --build-cache assembleDebugAndroidTest