diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3a2c3a1e..1b2a867d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.api.BaseVariantOutputImpl
-
 plugins {
   id("com.android.application")
   kotlin("android")
@@ -17,11 +15,6 @@ android {
     applicationId = "dev.msfjarvis.lobsters"
     testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"
   }
-  applicationVariants.all {
-    outputs.all {
-      (this as BaseVariantOutputImpl).outputFileName = "Claw-$versionName.apk"
-    }
-  }
 }
 
 dependencies {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 584d0357..64c3eb39 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -24,7 +24,7 @@ gradlePlugin {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:7.0.0-alpha14")
+  implementation("com.android.tools.build:gradle:7.0.0-alpha15")
   implementation("com.google.dagger:hilt-android-gradle-plugin:2.35.1")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
   implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.4.32-1.0.0-alpha08")
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 954fef9c..b51bbfc9 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -78,7 +78,7 @@ internal fun BaseAppModuleExtension.configureAndroidApplicationOptions(project:
   buildTypes {
     named("release") {
       isMinifyEnabled = !minifySwitch.isPresent
-      setProguardFiles(listOf("proguard-android-optimize.txt", "proguard-rules.pro"))
+      proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
     }
     named("debug") {
       applicationIdSuffix = ".debug"
@@ -94,8 +94,8 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
   compileSdkVersion(30)
 
   defaultConfig {
-    minSdkVersion(23)
-    targetSdkVersion(30)
+    minSdk = 23
+    targetSdk = 23
   }
 
   packagingOptions.resources.excludes.addAll(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ed0aa05f..70d5b2c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ sqldelight = "1.5.0"
 
 [libraries]
 # buildSrc dependencies, they are not used from here for now so manually update buildSrc/build.gradle.kts as well
-androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha14"
+androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha15"
 composeGradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jb_compose" }
 hiltGradlePlugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "dagger_hilt" }
 jsemverGradlePlugin = "com.github.zafarkhaja:java-semver:0.9.0"