diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts
index 68881c2b57..6aa8911587 100644
--- a/libraries/androidutils/build.gradle.kts
+++ b/libraries/androidutils/build.gradle.kts
@@ -16,46 +16,14 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    id("io.element.android-library")
 }
 
 android {
     namespace = "io.element.android.libraries.androidutils"
-    compileSdk = 32
-
-    defaultConfig {
-        minSdk = 21
-        targetSdk = 32
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 dependencies {
     implementation(libs.timber)
-    implementation("androidx.core:core-ktx:1.7.0")
-    implementation("androidx.appcompat:appcompat:1.6.0")
-    implementation("com.google.android.material:material:1.7.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation(libs.androidx.corektx)
 }
diff --git a/libraries/elementresources/build.gradle.kts b/libraries/elementresources/build.gradle.kts
index b61593b700..3451be5c38 100644
--- a/libraries/elementresources/build.gradle.kts
+++ b/libraries/elementresources/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.element.resources"
+    namespace = "io.element.android.libraries.resources"
 }
 
 dependencies {
diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
index 2948685b74..f81e8c2c19 100644
--- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
+++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
@@ -40,6 +40,7 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.google.android.material.shape.MaterialShapeDrawable
+import io.element.android.libraries.androidutils.ui.DimensionConverter
 import io.element.android.libraries.androidutils.ui.hideKeyboard
 import io.element.android.libraries.androidutils.ui.showKeyboard
 import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLayoutBinding
@@ -49,7 +50,7 @@ import io.element.android.wysiwyg.EditorEditText
 import io.element.android.wysiwyg.inputhandlers.models.InlineFormat
 import uniffi.wysiwyg_composer.ActionState
 import uniffi.wysiwyg_composer.ComposerAction
-import io.element.android.element.resources.R as ElementR
+import io.element.android.libraries.resources.R as ElementR
 import io.element.android.libraries.ui.strings.R as StringR
 
 // Imported from Element Android
@@ -117,8 +118,7 @@ class RichTextComposerLayout @JvmOverloads constructor(
         }
     }
 
-    private val dimensionConverter =
-        io.element.android.libraries.androidutils.ui.DimensionConverter(resources)
+    private val dimensionConverter = DimensionConverter(resources)
 
     fun setFullScreen(isFullScreen: Boolean, animated: Boolean, manageKeyboard: Boolean) {
         if (!animated && views.composerLayout.layoutParams != null) {