diff --git a/.github/workflows/android_build.yaml b/.github/workflows/android_build.yaml
index f14405690..8bd8d87f1 100644
--- a/.github/workflows/android_build.yaml
+++ b/.github/workflows/android_build.yaml
@@ -16,9 +16,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
       - name: Set Up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -26,7 +23,10 @@ jobs:
           distribution: temurin
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
 
       - name: Build Project with gradle
         run: ./gradlew assembleDebug
@@ -73,13 +73,24 @@ jobs:
 
   androidTest:
     needs: build
-    runs-on: ubuntu-latest # enables hardware acceleration in the virtual machine
+    runs-on: ubuntu-latest
     timeout-minutes: 55
     strategy:
       matrix:
         api-level: [ 26, 30 ]
 
     steps:
+      - name: Delete unnecessary tools 🔧
+        uses: jlumbroso/free-disk-space@v1.3.1
+        with:
+          android: false # Don't remove Android tools
+          tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
+          dotnet: true # rm -rf /usr/share/dotnet
+          haskell: true # rm -rf /opt/ghc...
+          swap-storage: true # rm -f /mnt/swapfile (4GiB)
+          docker-images: false # Takes 16s, enable if needed in the future
+          large-packages: false # includes google-cloud-sdk and it's slow
+
       - name: Enable KVM group perms
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -100,18 +111,20 @@ jobs:
           distribution: temurin
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
 
-      - name: Run instrumentation tests
+      - name: Build projects and run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
           disable-animations: true
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disk-size: 6000M
           heap-size: 600M
-          script: ./gradlew connectedCheck
+          script: ./gradlew connectedCheck --daemon
 
       - name: Upload test reports
         if: always()
diff --git a/.github/workflows/github_release.yaml b/.github/workflows/github_release.yaml
index 2840d7ba0..f9f83c434 100644
--- a/.github/workflows/github_release.yaml
+++ b/.github/workflows/github_release.yaml
@@ -12,9 +12,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
       - name: Set Up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -22,7 +19,10 @@ jobs:
           distribution: temurin
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
 
       - name: Get Tag Name
         run: |