diff --git a/Habitica/build.gradle.kts b/Habitica/build.gradle.kts
index 666dfe8f0..9e9ec042b 100644
--- a/Habitica/build.gradle.kts
+++ b/Habitica/build.gradle.kts
@@ -2,20 +2,20 @@ import com.android.build.gradle.internal.lint.AndroidLintTask
 
 plugins {
     `jacoco-report-aggregation`
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.navigation)
-    alias(libs.plugins.ksp)
+    id(libs.plugins.kotlin.android.get().pluginId)
+    id(libs.plugins.android.application.get().pluginId)
+    id(libs.plugins.hilt.get().pluginId)
+    id(libs.plugins.navigation.get().pluginId)
+    id(libs.plugins.ksp.get().pluginId)
     id("kotlin-parcelize")
     id("kotlin-kapt")
-    alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.realm)
-    alias(libs.plugins.habitrpg.application)
-    alias(libs.plugins.habitrpg.convention)
-    alias(libs.plugins.crashlytics)
-    alias(libs.plugins.firebase.perf)
-    alias(libs.plugins.google.service)
+    id(libs.plugins.kotlin.compose.get().pluginId)
+    id(libs.plugins.realm.get().pluginId)
+    id(libs.plugins.habitrpg.application.get().pluginId)
+    id(libs.plugins.habitrpg.convention.get().pluginId)
+    id(libs.plugins.crashlytics.get().pluginId)
+    id(libs.plugins.firebase.perf.get().pluginId)
+    id(libs.plugins.google.service.get().pluginId)
 }
 
 android {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index a895119fa..8eba2e3f0 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -2,10 +2,10 @@ import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.habitrpg.convention)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.compose)
+    id(libs.plugins.kotlin.android.get().pluginId)
+    id(libs.plugins.habitrpg.convention.get().pluginId)
+    id(libs.plugins.android.library.get().pluginId)
+    id(libs.plugins.kotlin.compose.get().pluginId)
 }
 
 android {
diff --git a/fastlane/README.md b/fastlane/README.md
deleted file mode 100644
index f57928b5d..000000000
--- a/fastlane/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-fastlane documentation
-----
-
-# Installation
-
-Make sure you have the latest version of the Xcode command line tools installed:
-
-```sh
-xcode-select --install
-```
-
-For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
-
-# Available Actions
-
-## Android
-
-### android test
-
-```sh
-[bundle exec] fastlane android test
-```
-
-Runs all the tests
-
-### android staffapk
-
-```sh
-[bundle exec] fastlane android staffapk
-```
-
-Build Staff APK
-
-### android staff
-
-```sh
-[bundle exec] fastlane android staff
-```
-
-Submit a new Staff Build to Google Play
-
-### android alpha
-
-```sh
-[bundle exec] fastlane android alpha
-```
-
-Submit a new Alpha Build to Google Play
-
-### android beta
-
-```sh
-[bundle exec] fastlane android beta
-```
-
-Submit a new Beta Build to Google Play
-
-### android deploy
-
-```sh
-[bundle exec] fastlane android deploy
-```
-
-Deploy a new version to the Google Play
-
-----
-
-This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-
-More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
-
-The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cacf43be7..3da47a2c3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jun 10 15:25:21 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index c4cdcbeca..60b31c0d4 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -3,11 +3,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
-    alias(libs.plugins.android.library)
+    id(libs.plugins.android.library.get().pluginId)
     id("kotlin-parcelize")
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.habitrpg.convention)
-    alias(libs.plugins.kotest)
+    id(libs.plugins.ksp.get().pluginId)
+    id(libs.plugins.habitrpg.convention.get().pluginId)
+    id(libs.plugins.kotest.get().pluginId)
 }
 
 kotlin {
@@ -58,4 +58,4 @@ android {
 
 tasks.withType<KotlinCompile> {
     compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
-}
\ No newline at end of file
+}
diff --git a/version.properties b/version.properties
index 004f6f00c..05cd2521e 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-NAME=4.6.1
-CODE=12041
\ No newline at end of file
+NAME=4.7.0
+CODE=10351
\ No newline at end of file
diff --git a/wearos/build.gradle.kts b/wearos/build.gradle.kts
index 18ae8e2ca..f1c9ad99f 100644
--- a/wearos/build.gradle.kts
+++ b/wearos/build.gradle.kts
@@ -1,12 +1,12 @@
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.habitrpg.convention)
-    alias(libs.plugins.habitrpg.application)
-    alias(libs.plugins.crashlytics)
-    alias(libs.plugins.google.service)
+    id(libs.plugins.android.application.get().pluginId)
+    id(libs.plugins.kotlin.android.get().pluginId)
+    id(libs.plugins.ksp.get().pluginId)
+    id(libs.plugins.hilt.get().pluginId)
+    id(libs.plugins.habitrpg.convention.get().pluginId)
+    id(libs.plugins.habitrpg.application.get().pluginId)
+    id(libs.plugins.crashlytics.get().pluginId)
+    id(libs.plugins.google.service.get().pluginId)
 }
 
 android {