diff --git a/Core b/Core
index 5d33ffb6ec..6ed3f23ffb 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit 5d33ffb6ec07ea86a863d3c851e45dbf46ca2a47
+Subproject commit 6ed3f23ffbefbf212cdb2a9560d8947b01aaccad
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3aedf5511f..300c77083f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -157,6 +157,7 @@ dependencies {
 
     implementation(core.infomaniak.core.auth)
     implementation(core.infomaniak.core.avatar)
+    implementation(core.infomaniak.core.bugtracker)
     implementation(core.infomaniak.core.coil)
     implementation(core.infomaniak.core.common)
     implementation(core.infomaniak.core.crossapplogin)
@@ -183,7 +184,6 @@ dependencies {
 
     implementation(project(":Core:Legacy"))
     implementation(project(":Core:Legacy:AppLock"))
-    implementation(project(":Core:Legacy:BugTracker"))
 
     // Compose
     implementation(platform(core.compose.bom))
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cba3c5e0f1..f7a9be117f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -238,7 +238,7 @@
             android:theme="@style/AppTheme.RequiredUpdate"/>
 
         <activity
-            android:name="com.infomaniak.core.legacy.bugtracker.BugTrackerActivity"
+            android:name="com.infomaniak.core.bugtracker.BugTrackerActivity"
             android:configChanges="orientation|screenSize"
             android:exported="false"
             android:theme="@style/AppTheme.BugTracker" />
diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
index 8488a84346..7272964f78 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
@@ -35,13 +35,13 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.infomaniak.core.auth.room.UserDatabase
+import com.infomaniak.core.bugtracker.BugTrackerActivity
+import com.infomaniak.core.bugtracker.BugTrackerActivityArgs
 import com.infomaniak.core.crossapplogin.back.CrossAppLogin
 import com.infomaniak.core.fragmentnavigation.safelyNavigate
 import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
 import com.infomaniak.core.ksuite.ui.utils.MatomoKSuite
 import com.infomaniak.core.legacy.applock.LockActivity
-import com.infomaniak.core.legacy.bugtracker.BugTrackerActivity
-import com.infomaniak.core.legacy.bugtracker.BugTrackerActivityArgs
 import com.infomaniak.core.legacy.ui.WebViewActivity
 import com.infomaniak.core.legacy.utils.UtilsUi.openUrl
 import com.infomaniak.core.legacy.utils.getBackNavigationResult
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 639580098f..c7d4574d95 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,5 +30,4 @@ include(
     ":app",
     ":Core:Legacy",
     ":Core:Legacy:AppLock",
-    ":Core:Legacy:BugTracker",
 )