diff --git a/gradle.properties b/gradle.properties
index 445a78d57..ed7ead318 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,8 @@
 org.gradle.configureondemand=true
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# Ensure important default jvmargs aren't overwritten. See https://github.com/gradle/gradle/issues/19750
+org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -18,9 +19,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Allow kapt to use incremental processing
-kapt.incremental.apt=true
\ No newline at end of file
+kapt.incremental.apt=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2387444d2..24770d8e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -41,7 +41,7 @@ protobufPlugin = "0.8.18"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "0.8.0"
 room = "2.4.1"
-spotless = "6.0.0"
+spotless = "6.3.0"
 turbine = "0.7.0"
 
 [libraries]
diff --git a/settings.gradle b/settings.gradle
index 7f4c5a29c..1c5bbab06 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,17 +14,21 @@
  * limitations under the License.
  */
 
-// Use version catalogs for managing dependencies
-// https://docs.gradle.org/current/userguide/platforms.html
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        // Register the AndroidX snapshot repository first so snapshots don't attempt (and fail)
+        // to download from the non-snapshot repositories
+        maven {
+            url 'https://androidx.dev/snapshots/builds/8273139/artifacts/repository'
+            content {
+                // The AndroidX snapshot repository will only have androidx artifacts, don't
+                // bother trying to find other ones
+                includeGroupByRegex("androidx\\..*")
+            }
+        }
         google()
         mavenCentral()
-        gradlePluginPortal()
-        maven { url 'https://androidx.dev/snapshots/builds/8273139/artifacts/repository' }
     }
 }
 rootProject.name = "nowinandroid"