diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 99d96ede5272..de640212577e 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -128,15 +128,8 @@ android {
     useLibrary 'android.test.base'
     useLibrary 'android.test.mock'
 
-    dexOptions {
-        jumboMode = true
-        dexInProcess = true
-    }
-
     namespace "org.wordpress.android"
 
-    compileSdkVersion rootProject.compileSdkVersion
-
     def versionProperties = loadPropertiesFromFile(file("${rootDir}/version.properties"))
 
     defaultConfig {
@@ -148,6 +141,7 @@ android {
 
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
+        compileSdk rootProject.compileSdkVersion
 
         testInstrumentationRunner 'org.wordpress.android.WordPressTestRunner'
 
@@ -515,7 +509,7 @@ dependencies {
     implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion"
     implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion"
     implementation "com.zendesk:support:$zendeskVersion"
-    implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library
+    implementation files('../aars/tenor-android-core-jetified.aar') // Jetified Tenor Gif library
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
     implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion"
@@ -570,7 +564,7 @@ dependencies {
     androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion",  {
         exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18'
     }
-    androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing
+    androidTestImplementation files('../aars/cloudtestingscreenshotter_lib.aar') // Screenshots on Firebase Cloud Testing
     androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion"
     androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion"
     kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
diff --git a/build.gradle b/build.gradle
index 946bd5e46983..76b6d359d09e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -154,9 +154,6 @@ allprojects {
                 includeVersion "com.jraska", "falcon", "2.1.1"
             }
         }
-        flatDir {
-            dirs '../aars'
-        }
     }
 
     tasks.register("checkstyle", Checkstyle) {
diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle
index d3e8edf28570..dba010fb5c97 100644
--- a/libs/analytics/build.gradle
+++ b/libs/analytics/build.gradle
@@ -25,11 +25,10 @@ dependencies {
 android {
     namespace "org.wordpress.android.analytics"
 
-    compileSdkVersion rootProject.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
+        compileSdk rootProject.compileSdkVersion
     }
 
     lint {
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index d50c03155102..aff1c1205df7 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -31,11 +31,10 @@ repositories {
 android {
     namespace "org.wordpress.android.editor"
 
-    compileSdkVersion rootProject.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
+        compileSdk rootProject.compileSdkVersion
     }
 
     lint {
diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
index 2cdd7f6bf40f..b5e467505b98 100644
--- a/libs/image-editor/build.gradle
+++ b/libs/image-editor/build.gradle
@@ -9,11 +9,10 @@ plugins {
 android {
     namespace "org.wordpress.android.imageeditor"
 
-    compileSdkVersion rootProject.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
+        compileSdk rootProject.compileSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle
index 40db9b3997cf..04c77ec499e6 100644
--- a/libs/mocks/build.gradle
+++ b/libs/mocks/build.gradle
@@ -5,11 +5,10 @@ plugins {
 android {
     namespace "org.wordpress.android.mocks"
 
-    compileSdkVersion rootProject.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
+        compileSdk rootProject.compileSdkVersion
     }
 
     lint {
diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle
index 457a92785de9..e532daff8d2e 100644
--- a/libs/networking/build.gradle
+++ b/libs/networking/build.gradle
@@ -5,11 +5,10 @@ plugins {
 android {
     namespace "org.wordpress.android.networking"
 
-    compileSdkVersion rootProject.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
+        compileSdk rootProject.compileSdkVersion
     }
 
     lint {