diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt
index d8056f66..ab234450 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt
@@ -21,7 +21,7 @@ class ExtractWorkArgumentsMapping(
                 language = it.language,
                 arguments = it.codecParameters + it.optionalParameters + listOf("-map", "0:s:${it.index}"),
                 outputFileName = "${outFileFullName}.${it.language}.${it.format}",
-                storeFileName = "${outFileFullName}.${it.format}"
+                storeFileName = outFileFullName
             )
         }
 
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt
index 8f2673a5..34cc6e57 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt
@@ -64,7 +64,7 @@ class ContentCompletionMover(val collection: String, val events: List<Event>) {
     data class MovableSubtitle(
         val language: String,
         val cachedFile: File,
-        val storeFile: String
+        val storeFileName: String
     )
 
     fun getMovableSubtitles(): List<MovableSubtitle> {
@@ -78,14 +78,14 @@ class ContentCompletionMover(val collection: String, val events: List<Event>) {
         extracted.map { MovableSubtitle(
             language = it.language,
             cachedFile = File(it.outputFile),
-            storeFile = it.storeFileName
+            storeFileName = it.storeFileName
         ) }.also { items.addAll(it) }
 
         converted.flatMap { it.outputFiles.map { outFile ->
             MovableSubtitle(
                 language = it.language,
                 cachedFile = File(outFile),
-                storeFile = it.baseName
+                storeFileName = it.baseName
             )
         } }.also { items.addAll(it) }
 
@@ -112,7 +112,7 @@ class ContentCompletionMover(val collection: String, val events: List<Event>) {
                     it.mkdirs()
                 }
             }
-            val storeFile = languageFolder.using(movable.storeFile)
+            val storeFile = languageFolder.using("${movable.storeFileName}.${movable.cachedFile.extension}")
             val success = movable.cachedFile.moveTo(storeFile)
             if (success) {
                 moved.add(MovedSubtitle(movable.language, movable.cachedFile.absolutePath, storeFile.absolutePath))