diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
index e89477bb..39e3df59 100644
--- a/.github/workflows/android_build.yml
+++ b/.github/workflows/android_build.yml
@@ -10,7 +10,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 15
 
     steps:
 
@@ -50,4 +50,4 @@ jobs:
         run: ./gradlew build
 
       - name: Junit tests with Gradle
-        run: ./gradlew testDebugUnitTest
\ No newline at end of file
+        run: ./gradlew testDebugUnitTest
diff --git a/build.gradle.kts b/build.gradle.kts
index 60b49721..b5f0d0b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.application) apply false
     alias(libs.plugins.kotlin) apply false
@@ -7,7 +6,6 @@ plugins {
     alias(libs.plugins.serialization)
     alias(libs.plugins.ksp) apply false
 }
-true // Needed to make the Suppress annotation work for the plugins block
 
 buildscript {
 
@@ -18,5 +16,5 @@ buildscript {
 }
 
 tasks.register(name = "type", type = Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.projectDir.resolve("build"))
 }