diff --git a/Core b/Core
index 6ed3f23ffb..f405b946f3 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit 6ed3f23ffbefbf212cdb2a9560d8947b01aaccad
+Subproject commit f405b946f30308e16dbbac79186c89e490d93f65
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 300c77083f..7128c1831d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -154,7 +154,7 @@ sentry {
 }
 
 dependencies {
-
+    implementation(core.infomaniak.core.applock)
     implementation(core.infomaniak.core.auth)
     implementation(core.infomaniak.core.avatar)
     implementation(core.infomaniak.core.bugtracker)
@@ -183,7 +183,6 @@ dependencies {
     implementation(core.infomaniak.core.ui.view.edgetoedge)
 
     implementation(project(":Core:Legacy"))
-    implementation(project(":Core:Legacy:AppLock"))
 
     // Compose
     implementation(platform(core.compose.bom))
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f7a9be117f..d8d6e4610a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -228,7 +228,7 @@
             android:theme="@style/WebViewTheme" />
 
         <activity
-            android:name="com.infomaniak.core.legacy.applock.LockActivity"
+            android:name="com.infomaniak.core.applock.LockActivity"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Lock" />
 
diff --git a/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
index 9aa2908e03..8f6dec69a0 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
@@ -66,7 +66,7 @@ import com.infomaniak.core.inappreview.BaseInAppReviewManager
 import com.infomaniak.core.inappreview.reviewmanagers.InAppReviewManager
 import com.infomaniak.core.inappreview.view.ReviewAlertDialog
 import com.infomaniak.core.inappreview.view.ReviewAlertDialogData
-import com.infomaniak.core.legacy.applock.LockActivity
+import com.infomaniak.core.applock.LockActivity
 import com.infomaniak.core.legacy.utils.CoilUtils.simpleImageLoader
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showIndefiniteSnackbar
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
diff --git a/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
index 05eca6d641..2bfc8e3309 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
@@ -39,7 +39,7 @@ import androidx.navigation.navArgs
 import com.google.android.material.textfield.TextInputEditText
 import com.infomaniak.core.common.utils.FORMAT_NEW_FILE
 import com.infomaniak.core.common.utils.format
-import com.infomaniak.core.legacy.applock.LockActivity
+import com.infomaniak.core.applock.LockActivity
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.core.legacy.utils.getFileName
 import com.infomaniak.core.legacy.utils.hideProgressCatching
diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
index 5091e792b8..c39aa676e1 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
@@ -21,8 +21,8 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.infomaniak.core.legacy.applock.LockActivity
-import com.infomaniak.core.legacy.applock.Utils.silentlyReverseSwitch
+import com.infomaniak.core.applock.LockActivity
+import com.infomaniak.core.applock.Utils.silentlyReverseSwitch
 import com.infomaniak.core.twofactorauth.front.TwoFactorAuthApprovalAutoManagedBottomSheet
 import com.infomaniak.core.twofactorauth.front.addComposeOverlay
 import com.infomaniak.drive.R
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 7272964f78..1d86c31931 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
@@ -41,7 +41,7 @@ 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.applock.LockActivity
 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 c7d4574d95..4e2e86dfed 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -29,5 +29,4 @@ rootProject.name = "kDrive"
 include(
     ":app",
     ":Core:Legacy",
-    ":Core:Legacy:AppLock",
 )