diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index aea05b5a22..3e9dbab5c6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,8 +81,12 @@ jobs:
             **/out/failures/
             **/build/reports/tests/*UnitTest/
 
-      - name: 🔊 Publish results to Sonar (disabled)
-        run: echo "This is now done only once a day, see nightlyReports.yml"
+      - name: 🔊 Publish results to Sonar
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+        if: ${{ always() && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
+        run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
 
       # https://github.com/codecov/codecov-action
       - name: ☂️ Upload coverage reports to codecov
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
index 46de8fff91..f79284d082 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
@@ -20,6 +20,7 @@ import android.net.Uri
 import io.element.android.features.createroom.impl.configureroom.RoomPrivacy
 import io.element.android.features.createroom.impl.di.CreateRoomScope
 import io.element.android.features.createroom.impl.userlist.UserListDataStore
+import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.di.SingleIn
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
@@ -36,7 +37,7 @@ class CreateRoomDataStore @Inject constructor(
     private val createRoomConfigFlow: MutableStateFlow<CreateRoomConfig> = MutableStateFlow(CreateRoomConfig())
     private var cachedAvatarUri: Uri? = null
         set(value) {
-            field?.path?.let { File(it) }?.delete()
+            field?.path?.let { File(it) }?.safeDelete()
             field = value
         }
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
index c9053d67c9..e6e1ce8e83 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
@@ -80,8 +80,7 @@ fun ConfirmAccountProviderView(
                     id = if (state.isAccountCreation) {
                         R.string.screen_account_provider_signup_subtitle
                     } else {
-                        // Use same value for now.
-                        R.string.screen_account_provider_signup_subtitle
+                        R.string.screen_account_provider_signin_subtitle
                     },
                 )
             )
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt
index 581d45a2b0..269407d3b5 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt
@@ -35,6 +35,19 @@ fun File.safeDelete() {
     )
 }
 
+fun File.safeRenameTo(dest: File) {
+    tryOrNull(
+        onError = {
+            Timber.e(it, "Error, unable to rename file $path to ${dest.path}")
+        },
+        operation = {
+            if (renameTo(dest).not()) {
+                Timber.w("Warning, unable to rename file $path to ${dest.path}")
+            }
+        }
+    )
+}
+
 fun Context.createTmpFile(baseDir: File = cacheDir, extension: String? = null): File {
     val suffix = extension?.let { ".$extension" }
     return File.createTempFile(UUID.randomUUID().toString(), suffix, baseDir).apply { mkdirs() }
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
index 9dfc04ddec..9482aecc13 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
@@ -24,6 +24,7 @@ import androidx.exifinterface.media.ExifInterface
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.androidutils.file.createTmpFile
 import io.element.android.libraries.androidutils.file.getFileName
+import io.element.android.libraries.androidutils.file.safeRenameTo
 import io.element.android.libraries.androidutils.media.runAndRelease
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.data.tryOrNull
@@ -105,7 +106,7 @@ class AndroidMediaPreProcessor @Inject constructor(
     private fun MediaUploadInfo.postProcess(uri: Uri): MediaUploadInfo {
         val name = context.getFileName(uri) ?: return this
         val renamedFile = File(context.cacheDir, name).also {
-            file.renameTo(it)
+            file.safeRenameTo(it)
         }
         return when (this) {
             is MediaUploadInfo.AnyFile -> copy(file = renamedFile)
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/VideoCompressor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/VideoCompressor.kt
index 490e286353..e7e294cd7c 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/VideoCompressor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/VideoCompressor.kt
@@ -21,6 +21,7 @@ import android.net.Uri
 import com.otaliastudios.transcoder.Transcoder
 import com.otaliastudios.transcoder.TranscoderListener
 import io.element.android.libraries.androidutils.file.createTmpFile
+import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.di.ApplicationContext
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
@@ -46,12 +47,12 @@ class VideoCompressor @Inject constructor(
                 }
 
                 override fun onTranscodeCanceled() {
-                    tmpFile.delete()
+                    tmpFile.safeDelete()
                     close()
                 }
 
                 override fun onTranscodeFailed(exception: Throwable) {
-                    tmpFile.delete()
+                    tmpFile.safeDelete()
                     close(exception)
                 }
             })
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventPersistence.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventPersistence.kt
index d6135f28b0..613a8d2bb7 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventPersistence.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventPersistence.kt
@@ -18,6 +18,7 @@ package io.element.android.libraries.push.impl.notifications
 
 import android.content.Context
 import io.element.android.libraries.androidutils.file.EncryptedFileFactory
+import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.ApplicationContext
@@ -70,7 +71,7 @@ class NotificationEventPersistence @Inject constructor(
     fun persistEvents(queuedEvents: NotificationEventQueue) {
         Timber.tag(loggerTag.value).d("Serializing ${queuedEvents.rawEvents().size} NotifiableEvent(s)")
         // Always delete file before writing, or encryptedFile.openFileOutput() will throw
-        file.delete()
+        file.safeDelete()
         if (queuedEvents.isEmpty()) return
         try {
             encryptedFile.openFileOutput().use { fos ->