diff --git a/modules/samtools/convert/main.nf b/modules/samtools/convert/main.nf
index a7ec1bda..b20f2b93 100644
--- a/modules/samtools/convert/main.nf
+++ b/modules/samtools/convert/main.nf
@@ -13,16 +13,15 @@ process SAMTOOLS_CONVERT {
     path  fai
 
     output:
-    tuple val(meta), path("*.cram"), path("*.crai") , emit: cram_crai, optional: true
-    tuple val(meta), path("*.bam"), path("*.bai")   , emit: bam_bai, optional:true
-    path  "versions.yml"                            , emit: versions
+    tuple val(meta), path("*.{cram,bam}"), path("*.{crai,bai}") , emit: aligned_index
+    path  "versions.yml"                                        , emit: versions
 
     when:
     task.ext.when == null || task.ext.when
 
     script:
     def args = task.ext.args  ?: ''
-    def prefix = task.ext.prefix ?: "${meta.id}"
+    prefix = task.ext.prefix ?: "${meta.id}"
     def file_type = input.getExtension() == "bam" ? "cram" : "bam"
 
     """
diff --git a/modules/samtools/convert/meta.yml b/modules/samtools/convert/meta.yml
index 2396f0b3..87727255 100644
--- a/modules/samtools/convert/meta.yml
+++ b/modules/samtools/convert/meta.yml
@@ -39,14 +39,10 @@ output:
       description: |
         Groovy Map containing sample information
         e.g. [ id:'test', single_end:false ]
-  - cram_crai:
+  - aligned_index:
       type: file
-      description: filtered/converted CRAM file + index
-      pattern: "*{.cram,.crai}"
-  - bam_bai:
-      type: file
-      description: filtered/converted BAM file + index
-      pattern: "*{.bam,.bai}"
+      description: filtered/converted BAM/CRAM file + index
+      pattern: "*{.bam/cram,.bai/crai}"
   - version:
       type: file
       description: File containing software version