diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index a21dd10e..81c54c87 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -16,13 +16,10 @@ env:
   CI: true
   TERM: dumb
   GRADLE_OPTS: >-
-    -Dorg.gradle.jvmargs="-Xmx3G -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
-    -Dorg.gradle.workers.max=2
-    -Dorg.gradle.vfs.watch=false
+    -Dorg.gradle.jvmargs="-Xmx4G -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1"
     -Dorg.gradle.dependency.verification.console=verbose
-    -DwarningsAsErrors=false
   KOTLIN_DAEMON_JVMARGS: >-
-    -Xmx2G -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1
+    -Xmx1G -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1
 
 jobs:
   assemble:
@@ -43,14 +40,11 @@ jobs:
       - name: Check LFS files
         uses: actionsdesk/lfs-warning@v3.2
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '20'
+          java-version: '21'
 
       - name: Unpack pixnews.properties
         env:
@@ -125,14 +119,11 @@ jobs:
           [ ! -e ~/.dprint/bin/dprint ] &&  curl -fsSL https://dprint.dev/install.sh | sh > /dev/null 2>&1
           echo "$HOME/.dprint/bin" >> $GITHUB_PATH
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '20'
+          java-version: '21'
 
       - name: Run dprint
         run: dprint check
diff --git a/.github/workflows/BuildOnPushMain.yml b/.github/workflows/BuildOnPushMain.yml
index 7c6d5b21..5ffed05d 100644
--- a/.github/workflows/BuildOnPushMain.yml
+++ b/.github/workflows/BuildOnPushMain.yml
@@ -21,14 +21,10 @@ env:
   CI: true
   TERM: dumb
   GRADLE_OPTS: >-
-    -Dorg.gradle.jvmargs="-Xmx1536M -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
-    -Dorg.gradle.parallel=true
-    -Dorg.gradle.workers.max=2
-    -Dorg.gradle.vfs.watch=false
+    -Dorg.gradle.jvmargs="-Xmx4G -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
     -Dorg.gradle.dependency.verification.console=verbose
-    -DwarningsAsErrors=false
   KOTLIN_DAEMON_JVMARGS: >-
-    -Xmx1536M -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1
+    -Xmx1G -XX:MaxMetaspaceSize=320M -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC -XX:NewRatio=1
 
 jobs:
   assemble:
@@ -46,14 +42,11 @@ jobs:
           lfs: true
           submodules: true
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '20'
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -107,11 +100,18 @@ jobs:
 
   instrumented-tests:
     name: Instrumented tests
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     if: ${{ !contains(github.event.head_commit.message, '[ci skip]') }}
 
     steps:
+      - 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: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -120,14 +120,11 @@ jobs:
           lfs: true
           submodules: true
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '20'
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -148,8 +145,6 @@ jobs:
           ./gradlew
           -Pkotlin.daemon.jvmargs="${{ env.KOTLIN_DAEMON_JVMARGS }}"
           -Dorg.gradle.workers.max=1
-          -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect
-          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
           -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=""
           pixel2api30DebugAndroidTest
           --scan --continue
@@ -173,7 +168,7 @@ jobs:
           -o -path '*/build/outputs/androidTest-results'
           -o -path '*/build/outputs/managed_*'
           -o -path '*/build/reports/androidTests' \) -print0
-          |  xargs -0 tar -c --zstd --options zstd:compression-level=20 -f instrumented-tests.tar.zst
+          | xargs -0 tar -c -I 'zstd -19 -T0' -f instrumented-tests.tar.zst
 
       - name: Upload test reports
         if: ${{ failure() }}
diff --git a/.github/workflows/GenerateBaselineProfile.yml b/.github/workflows/GenerateBaselineProfile.yml
index ce81cccf..2b004883 100644
--- a/.github/workflows/GenerateBaselineProfile.yml
+++ b/.github/workflows/GenerateBaselineProfile.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '20'
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/GradleWrapper.yml b/.github/workflows/GradleWrapper.yml
new file mode 100644
index 00000000..62e9c1dd
--- /dev/null
+++ b/.github/workflows/GradleWrapper.yml
@@ -0,0 +1,20 @@
+name: gradle-wrapper
+
+on:
+  pull_request:
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/'
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/InstrumentedTestOnSelfHostedRunner.yml b/.github/workflows/InstrumentedTestOnSelfHostedRunner.yml
index 1d87c8cb..fce521b8 100644
--- a/.github/workflows/InstrumentedTestOnSelfHostedRunner.yml
+++ b/.github/workflows/InstrumentedTestOnSelfHostedRunner.yml
@@ -24,7 +24,6 @@ env:
     -Dorg.gradle.jvmargs="-Xmx1536M -XX:MaxMetaspaceSize=1g -XX:SoftRefLRUPolicyMSPerMB=10 -XX:+UseParallelGC"
     -Dorg.gradle.parallel=true
     -Dorg.gradle.workers.max=2
-    -Dorg.gradle.vfs.watch=false
     -Dorg.gradle.dependency.verification.console=verbose
     -DwarningsAsErrors=false
   KOTLIN_DAEMON_JVMARGS: >-
@@ -51,14 +50,11 @@ jobs:
           lfs: true
           submodules: true
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '20'
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/gradle.properties b/gradle.properties
index 59cca0f1..2c149745 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,18 +12,20 @@ org.gradle.configuration-cache=true
 android.useAndroidX=true
 android.enableJetifier=false
 
+#Kotlin
 kotlin.code.style=official
-
-#Debug
-#org.gradle.dependency.verification=lenient
-#org.gradle.logging.level=debug
-#org.gradle.debug=true
+kotlin.compiler.preciseCompilationResultsBackup=true
 #kotlin.build.report.enable=true
 #kotlin.build.report.output=file
 #kotlin.build.report.verbose=true
 #Metrics
 #kotlin.build.report.metrics=true
 
+#Debug
+#org.gradle.dependency.verification=lenient
+#org.gradle.logging.level=debug
+#org.gradle.debug=true
+
 # Kapt controls
 kapt.include.compile.classpath=false
 
diff --git a/gradle/plugin/settings/settings-plugins.gradle.kts b/gradle/plugin/settings/settings-plugins.gradle.kts
index 67643ff9..82d980bc 100644
--- a/gradle/plugin/settings/settings-plugins.gradle.kts
+++ b/gradle/plugin/settings/settings-plugins.gradle.kts
@@ -9,5 +9,5 @@ plugins {
 group = "ru.pixnews.gradle.settings"
 
 dependencies {
-    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.14.1")
+    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.16.1")
 }