diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6138883c..c2aae01c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,16 +15,16 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: 'temurin'
+          distribution: temurin
           java-version: 11
-          cache: 'gradle'
+          cache: gradle
       - uses: gradle/wrapper-validation-action@v1
 
       - name: Prepare keystore
         run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks
 
       - name: Build signed package
-        run: ./gradlew app:assembleRelease
+        run: ./gradlew --no-daemon app:assembleRelease
         env:
           ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
index 503eeb7c..b41af284 100644
--- a/.github/workflows/test-dev.yml
+++ b/.github/workflows/test-dev.yml
@@ -10,13 +10,13 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: zulu
+          distribution: temurin
           java-version: 11
           cache: gradle
       - uses: gradle/wrapper-validation-action@v1
 
       - name: Run lint and unit tests
-        run: ./gradlew app:check
+        run: ./gradlew --no-daemon app:check
       - name: Archive results
         uses: actions/upload-artifact@v2
         with:
@@ -38,20 +38,17 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: gradle/wrapper-validation-action@v1
-
-      - name: Cache gradle dependencies
-        uses: actions/cache@v2
+      - uses: actions/setup-java@v2
         with:
-          key: ${{ runner.os }}
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
+          distribution: temurin
+          java-version: 11
+          cache: gradle
+      - uses: gradle/wrapper-validation-action@v1
 
       - name: Start emulator
         run: start-emulator.sh
       - name: Run connected tests
-        run: ./gradlew app:connectedCheck
+        run: ./gradlew --no-daemon app:connectedCheck
       - name: Archive results
         if: always()
         uses: actions/upload-artifact@v2