diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml
index 88ae79dd2..d80a57450 100644
--- a/.gitlab-ci-files/job-android.yml
+++ b/.gitlab-ci-files/job-android.yml
@@ -16,7 +16,7 @@ job-android:
 
   artifacts:
     paths:
-      - ./app/build/outputs/apk/debug/app-debug.apk
+      - ./app/build/outputs/apk/debug/linphone-android-debug-6.0.0.apk
     when: always
     expire_in: 1 week
 
diff --git a/app/build.gradle b/app/build.gradle
index 06f258f7f..10ae3547f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,7 +82,7 @@ android {
 
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
-            outputFileName = "linphone-android-${variant.buildType.name}-${project.version}.apk"
+            outputFileName = "linphone-android-${variant.buildType.name}-${versionName}.apk"
         }
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/viewer/viewmodel/FileViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewer/viewmodel/FileViewModel.kt
index 5897570cf..8b0bc9d44 100644
--- a/app/src/main/java/org/linphone/ui/main/viewer/viewmodel/FileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewer/viewmodel/FileViewModel.kt
@@ -8,7 +8,6 @@ import android.net.Uri
 import android.os.Environment
 import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
-import android.text.PrecomputedText
 import android.widget.ImageView
 import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData