diff --git a/app/src/main/kotlin/com/infomaniak/auth/MainApplication.kt b/app/src/main/kotlin/com/infomaniak/auth/MainApplication.kt
index 7cc6c531..527019f2 100644
--- a/app/src/main/kotlin/com/infomaniak/auth/MainApplication.kt
+++ b/app/src/main/kotlin/com/infomaniak/auth/MainApplication.kt
@@ -68,14 +68,13 @@ open class MainApplication : Application(), Configuration.Provider {
             appVersionCode = BuildConfig.VERSION_CODE,
             apiEnvironment = ApiEnvironment.Prod,
         )
+        userDataCleanableList = listOf<AssociatedUserDataCleanable>(DeviceInfoUpdateManager)
     }
 
     override fun onCreate() {
         super.onCreate()
         if (BuildConfig.DEBUG) setupStrictMode() else setupProductionThreadMonitoring()
         notificationUtils.initNotificationChannel()
-
-        userDataCleanableList = listOf<AssociatedUserDataCleanable>(DeviceInfoUpdateManager)
         applicationScope.launch {
             configureSentry(isDebug = BuildConfig.DEBUG, isSentryTrackingEnabled = SentryPreferences().isSentryAuthorized)
             DeviceInfoUpdateManager.scheduleWorkerOnDeviceInfoUpdate<DeviceInfoUpdateWorker>()
diff --git a/app/src/standard/kotlin/AndroidManifest.xml b/app/src/standard/AndroidManifest.xml
similarity index 100%
rename from app/src/standard/kotlin/AndroidManifest.xml
rename to app/src/standard/AndroidManifest.xml
diff --git a/app/src/standard/kotlin/com/infomaniak/auth/StandardMainApplication.kt b/app/src/standard/kotlin/com/infomaniak/auth/StandardMainApplication.kt
index 61dd94ac..811b78bc 100644
--- a/app/src/standard/kotlin/com/infomaniak/auth/StandardMainApplication.kt
+++ b/app/src/standard/kotlin/com/infomaniak/auth/StandardMainApplication.kt
@@ -24,9 +24,12 @@ import kotlinx.coroutines.launch
 
 class StandardMainApplication : MainApplication() {
 
+    init {
+        userDataCleanableList = userDataCleanableList + NotificationsRegistrationManager
+    }
+
     override fun onCreate() {
         super.onCreate()
-        userDataCleanableList = userDataCleanableList + NotificationsRegistrationManager
         registerUserDeviceIfNeeded()
     }