diff --git a/app/build.gradle b/app/build.gradle
index 787d545e6..480f448fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,9 +47,6 @@ dependencies {
     implementation project(':wordpress-shortcodes')
     implementation project(':media-placeholders')
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
-
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
 
@@ -60,3 +57,13 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 }
+
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // These dependency are not needed but kept to preserve the module's default configuration.
+            exclude(":media-placeholders")
+            exclude(":picasso-loader")
+        }
+    }
+}
diff --git a/aztec/build.gradle b/aztec/build.gradle
index ae7c97f3a..42c4f6702 100644
--- a/aztec/build.gradle
+++ b/aztec/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation "org.ccil.cowan.tagsoup:tagsoup:$tagSoupVersion"
     implementation "org.jsoup:jsoup:$jSoupVersion"
 
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.collection:collection:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
 
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
@@ -61,13 +61,6 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'androidx.test:core:1.4.0'
 
-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
 
diff --git a/aztec/src/main/res/layout/aztec_format_bar_advanced.xml b/aztec/src/main/res/layout/aztec_format_bar_advanced.xml
index 4b762c516..21ca5ac51 100644
--- a/aztec/src/main/res/layout/aztec_format_bar_advanced.xml
+++ b/aztec/src/main/res/layout/aztec_format_bar_advanced.xml
@@ -118,7 +118,7 @@
 
                     </RelativeLayout>
 
-                    <androidx.legacy.widget.Space
+                    <Space
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"/>
diff --git a/media-placeholders/build.gradle b/media-placeholders/build.gradle
index 66f820f83..35a19c3d3 100644
--- a/media-placeholders/build.gradle
+++ b/media-placeholders/build.gradle
@@ -43,6 +43,15 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
 
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise the build fails in multiple places.
+            exclude("androidx.appcompat:appcompat")
+        }
+    }
+}
+
 project.afterEvaluate {
     publishing {
         publications {
diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle
index cd44fa76d..af81eefd0 100644
--- a/picasso-loader/build.gradle
+++ b/picasso-loader/build.gradle
@@ -25,12 +25,21 @@ android {
 dependencies {
     implementation aztecProjectDependency
 
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.collection:collection:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     implementation "com.squareup.picasso:picasso:$picassoVersion"
 }
 
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise the build fails on 'aztec.tag'.
+            exclude("androidx.appcompat:appcompat")
+        }
+    }
+}
+
 project.afterEvaluate {
     publishing {
         publications {
diff --git a/settings.gradle b/settings.gradle
index f5477c396..d4e48466f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
     gradle.ext.kotlinVersion = '1.9.24'
     gradle.ext.agpVersion = '8.1.0'
     gradle.ext.automatticPublishToS3Version = '0.8.0'
-    gradle.ext.dependencyAnalysisVersion = '1.28.0'
+    gradle.ext.dependencyAnalysisVersion = '1.33.0'
 
     plugins {
         id "com.android.library" version gradle.ext.agpVersion
diff --git a/wordpress-comments/build.gradle b/wordpress-comments/build.gradle
index da633530d..e63e53796 100644
--- a/wordpress-comments/build.gradle
+++ b/wordpress-comments/build.gradle
@@ -38,14 +38,22 @@ android {
 dependencies {
     implementation aztecProjectDependency
 
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
 
     testImplementation "junit:junit:$jUnitVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
 
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise the build fails in multiple places.
+            exclude("androidx.appcompat:appcompat")
+        }
+    }
+}
+
 project.afterEvaluate {
     publishing {
         publications {
diff --git a/wordpress-shortcodes/build.gradle b/wordpress-shortcodes/build.gradle
index 672aeb681..ed2026f27 100644
--- a/wordpress-shortcodes/build.gradle
+++ b/wordpress-shortcodes/build.gradle
@@ -43,6 +43,15 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
 
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise the build fails in multiple places.
+            exclude("androidx.appcompat:appcompat")
+        }
+    }
+}
+
 project.afterEvaluate {
     publishing {
         publications {