diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 73cc00edee7b..47bb06c91f5c 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -411,14 +411,7 @@ dependencies {
     implementation (project(path:':libs:editor')) {
         exclude group: 'org.wordpress', module: 'utils'
     }
-    implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") {
-        version {
-            strictly wordPressFluxCVersion
-        }
-        exclude group: "com.android.volley"
-        exclude group: 'org.wordpress', module: 'utils'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
+    implementation project(':fluxc')
     implementation ("$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion") {
         version {
             strictly wordPressUtilsVersion
diff --git a/build.gradle b/build.gradle
index c8b7948a04e4..87b0ae00e9d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,8 @@ plugins {
     id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" apply false
     id "androidx.navigation.safeargs.kotlin" apply false
     id "com.android.library" apply false
+    id "org.jetbrains.kotlin.android" apply false
+    id "org.jetbrains.kotlin.kapt" apply false
     id 'com.google.gms.google-services' apply false
     id "org.jetbrains.kotlin.plugin.parcelize" apply false
     id "com.google.devtools.ksp" apply false
@@ -28,7 +30,6 @@ ext {
     automatticTracksVersion = '5.1.0'
     gutenbergMobileVersion = 'v1.121.0'
     wordPressAztecVersion = 'v2.1.4'
-    wordPressFluxCVersion = 'trunk-a77c116b8bd00247c8c0551b4497629ff84ca023'
     wordPressLoginVersion = '1.16.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressRsVersion = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1'
@@ -150,6 +151,13 @@ allprojects {
                 includeVersion "com.jraska", "falcon", "2.1.1"
             }
         }
+        maven {
+            url "https://a8c-libs.s3.amazonaws.com/android"
+            content {
+                includeGroup "org.wordpress"
+                includeGroup "org.wordpress.wellsql"
+            }
+        }
     }
 
     tasks.register("checkstyle", Checkstyle) {
@@ -178,7 +186,7 @@ allprojects {
     tasks.withType(KotlinCompile).all {
         kotlinOptions {
             jvmTarget = JavaVersion.VERSION_1_8
-            allWarningsAsErrors = true
+            allWarningsAsErrors = false
             freeCompilerArgs += [
                     "-opt-in=kotlin.RequiresOptIn",
                     "-Xjvm-default=all"
diff --git a/fluxc-processor/build.gradle b/fluxc-processor/build.gradle
index ef4c090a3452..27906c1c43e1 100644
--- a/fluxc-processor/build.gradle
+++ b/fluxc-processor/build.gradle
@@ -8,7 +8,7 @@ java {
 }
 
 dependencies {
-    implementation fluxcAnnotationsProjectDependency
+    implementation project(':fluxc-annotations')
     implementation sharedLibs.google.autoService
     annotationProcessor sharedLibs.google.autoService
     implementation sharedLibs.squareup.javapoet
diff --git a/fluxc/build.gradle b/fluxc/build.gradle
index 972f280bde33..934699f681d0 100644
--- a/fluxc/build.gradle
+++ b/fluxc/build.gradle
@@ -76,8 +76,8 @@ dependencies {
     kapt sharedLibs.wellsql.processor
 
     // FluxC annotations
-    api fluxcAnnotationsProjectDependency
-    kapt fluxcProcessorProjectDependency
+    api project(":fluxc-annotations")
+    kapt project(":fluxc-processor")
 
     // External libs
     api sharedLibs.eventbus.android
diff --git a/settings.gradle b/settings.gradle
index 751f2daebe94..541055f4108b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -32,6 +32,7 @@ pluginManagement {
         id "com.google.devtools.ksp" version gradle.ext.kspVersion
         id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion
         id "com.osacky.fladle" version gradle.ext.fladleVersion
+        id "org.jetbrains.kotlin.kapt" version gradle.ext.kotlinVersion
     }
     repositories {
         maven {
@@ -50,6 +51,36 @@ plugins {
     id "com.gradle.develocity" version "3.18.1"
 }
 
+def catalogVersion = "1.23.1"
+dependencyResolutionManagement {
+    repositories {
+        exclusiveContent {
+            forRepository {
+                maven {
+                    url = uri("https://a8c-libs.s3.amazonaws.com/android")
+                }
+            }
+            filter {
+                includeModule("com.automattic", "dependency-catalog")
+            }
+        }
+    }
+    versionCatalogs {
+        sharedLibs {
+            from("com.automattic:dependency-catalog:$catalogVersion")
+
+            version("androidx-annotation", "1.0.2")
+            version("androidx-appcompat", "1.0.2")
+            version("androidx-constraintlayout", "1.1.3")
+            version("androidx-recyclerview", "1.0.0")
+            version("apache-commons-text", "1.10.0")
+            version("facebook-flipper", "0.51.0")
+            version("facebook-soloader", "0.9.0")
+
+        }
+    }
+}
+
 rootProject.name = 'WPAndroid'
 
 include ':WordPress'
@@ -63,6 +94,8 @@ include ':libs:annotations'
 
 include ':libs:mocks'
 
+include ':fluxc', ':fluxc-annotations', ':fluxc-processor'
+
 apply from: './config/gradle/included_builds.gradle'
 apply from: './config/gradle/gradle_build_cache.gradle'
 apply from: './config/gradle/gradle_build_scan.gradle'