diff --git a/.github/renovate.json b/.github/renovate.json
index 053b7c7c6..a9eab3c4d 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -5,5 +5,8 @@
   ],
   "baseBranches": [
     "main"
+  ],
+  "gitIgnoredAuthors": [
+    "41898282+github-actions[bot]@users.noreply.github.com"
   ]
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index e090e2155..8e77a2600 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -26,13 +26,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - 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
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
@@ -45,12 +38,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
-      - name: Accept licenses
-        run: yes | sdkmanager --licenses || true
-
       - name: Check build-logic
         run: ./gradlew check -p build-logic
 
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
index c9ea51d42..e9ad2e922 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@@ -58,8 +58,8 @@ internal fun Project.configureAndroidCompose(
             reportsDestination = createPerModulePath("compose-reports")
         }
 
-        stabilityConfigurationFile =
-            rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
+        stabilityConfigurationFiles
+            .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf"))
     }
 }
 
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index 83c268aab..8c839fa8e 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -25,7 +25,6 @@ android {
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
-            isReturnDefaultValues = true
         }
     }
 }
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
index b17bf6abd..0d4ba37c5 100644
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@@ -25,11 +25,6 @@ android {
         consumerProguardFiles("consumer-proguard-rules.pro")
     }
     namespace = "com.google.samples.apps.nowinandroid.core.datastore"
-    testOptions {
-        unitTests {
-            isReturnDefaultValues = true
-        }
-    }
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index e2d6e0903..30c4eae04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -58,3 +58,7 @@ android.defaults.buildfeatures.shaders=false
 
 # Run Roborazzi screenshot tests with the local tests
 roborazzi.test.verify=true
+
+# Prevent uninstall app after instrumented tests
+# https://issuetracker.google.com/issues/295039976
+android.injected.androidTest.leaveApksInstalledAfterRun=true