diff --git a/conf/modules.config b/conf/modules.config
index 07afea1..4a9305c 100644
--- a/conf/modules.config
+++ b/conf/modules.config
@@ -178,6 +178,7 @@ process {
             ["GRCh38","hg38"].contains(params.genome) ? 'hg38' :
             ["mm10","GRCm38"].contains(params.genome) ? 'mm10' :
             'mm39'
+        storeDir = { "${params.reference_base}/${params.genome}/arriba" }
     }
 
     withName: MERGE_CFF {
@@ -224,6 +225,10 @@ process {
         ]
     }
 
+    withName: AGFUSION_DOWNLOAD {
+        storeDir = { "${params.reference_base}/${params.genome}/agfusion" }
+    }
+
     withName: ONCOKB_FUSIONANNOTATOR {
         ext.when = params.run_oncokb_fusionannotator
         secret = ["ONCOKB_TOKEN"]
diff --git a/modules.json b/modules.json
index c43247b..358c3c7 100644
--- a/modules.json
+++ b/modules.json
@@ -42,7 +42,7 @@
                     },
                     "gunzip": {
                         "branch": "master",
-                        "git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
+                        "git_sha": "3a5fef109d113b4997c9822198664ca5f2716208",
                         "installed_by": ["modules"]
                     },
                     "kallisto/index": {
diff --git a/modules/local/agfusion/batch/main.nf b/modules/local/agfusion/batch/main.nf
index 0544b5d..e8de04d 100644
--- a/modules/local/agfusion/batch/main.nf
+++ b/modules/local/agfusion/batch/main.nf
@@ -6,7 +6,7 @@ process AGFUSION_BATCH {
     conda 'bioconda::agfusion=1.252'
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'docker://cmopipeline/agfusion:0.0.6' :
-        'docker://cmopipeline/agfusion:0.0.6' }"
+        'docker.io/cmopipeline/agfusion:0.0.6' }"
 
     input:
     tuple val(meta), path(fusions)
diff --git a/modules/local/agfusion/download/main.nf b/modules/local/agfusion/download/main.nf
index 6647777..094ca39 100644
--- a/modules/local/agfusion/download/main.nf
+++ b/modules/local/agfusion/download/main.nf
@@ -5,7 +5,7 @@ process AGFUSION_DOWNLOAD {
     conda 'bioconda::agfusion=1.252'
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'docker://cmopipeline/agfusion:0.0.6' :
-        'docker://cmopipeline/agfusion:0.0.6' }"
+        'docker.io/cmopipeline/agfusion:0.0.6' }"
 
     input:
     val(ensembl_release)
diff --git a/modules/local/count_features/main.nf b/modules/local/count_features/main.nf
index 075a6ae..1ccff2b 100755
--- a/modules/local/count_features/main.nf
+++ b/modules/local/count_features/main.nf
@@ -5,7 +5,7 @@ process COUNT_FEATURES {
 /// must be using singularity 3.7+
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/bioconductor-rtracklayer:1.60.0--r43ha9d7317_0' :
-        'https://depot.galaxyproject.org/singularity/bioconductor-rtracklayer:1.60.0--r43ha9d7317_0' }"
+        'biocontainers/bioconductor-rtracklayer:1.60.0--r43ha9d7317_0' }"
 
     input:
     tuple val(meta), path(abundance)
diff --git a/modules/local/metafusion/main.nf b/modules/local/metafusion/main.nf
index 40b90ee..08e6590 100644
--- a/modules/local/metafusion/main.nf
+++ b/modules/local/metafusion/main.nf
@@ -4,7 +4,7 @@ process METAFUSION {
 
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'docker://cmopipeline/metafusion:0.0.6' :
-        'docker://cmopipeline/metafusion:0.0.6' }"
+        'docker.io/cmopipeline/metafusion:0.0.6' }"
 
     input:
     tuple val(meta), path(cff)
diff --git a/modules/nf-core/gunzip/environment.yml b/modules/nf-core/gunzip/environment.yml
new file mode 100644
index 0000000..25910b3
--- /dev/null
+++ b/modules/nf-core/gunzip/environment.yml
@@ -0,0 +1,7 @@
+name: gunzip
+channels:
+  - conda-forge
+  - bioconda
+  - defaults
+dependencies:
+  - conda-forge::sed=4.7
diff --git a/modules/nf-core/gunzip/main.nf b/modules/nf-core/gunzip/main.nf
index d906034..468a6f2 100644
--- a/modules/nf-core/gunzip/main.nf
+++ b/modules/nf-core/gunzip/main.nf
@@ -2,10 +2,10 @@ process GUNZIP {
     tag "$archive"
     label 'process_single'
 
-    conda "conda-forge::sed=4.7"
+    conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
-        'ubuntu:20.04' }"
+        'nf-core/ubuntu:20.04' }"
 
     input:
     tuple val(meta), path(archive)
@@ -21,10 +21,14 @@ process GUNZIP {
     def args = task.ext.args ?: ''
     gunzip = archive.toString() - '.gz'
     """
-    gunzip \\
-        -f \\
+    # Not calling gunzip itself because it creates files
+    # with the original group ownership rather than the
+    # default one for that user / the work directory
+    gzip \\
+        -cd \\
         $args \\
-        $archive
+        $archive \\
+        > $gunzip
 
     cat <<-END_VERSIONS > versions.yml
     "${task.process}":
diff --git a/modules/nf-core/gunzip/meta.yml b/modules/nf-core/gunzip/meta.yml
index 4d2ebc8..231034f 100644
--- a/modules/nf-core/gunzip/meta.yml
+++ b/modules/nf-core/gunzip/meta.yml
@@ -3,32 +3,37 @@ description: Compresses and decompresses files.
 keywords:
   - gunzip
   - compression
+  - decompression
 tools:
   - gunzip:
-    description: |
-      gzip is a file format and a software application used for file compression and decompression.
-    documentation: https://www.gnu.org/software/gzip/manual/gzip.html
-    licence: ["GPL-3.0-or-later"]
+      description: |
+        gzip is a file format and a software application used for file compression and decompression.
+      documentation: https://www.gnu.org/software/gzip/manual/gzip.html
+      licence: ["GPL-3.0-or-later"]
 input:
   - meta:
-    type: map
-    description: |
-      Optional groovy Map containing meta information
-      e.g. [ id:'test', single_end:false ]
+      type: map
+      description: |
+        Optional groovy Map containing meta information
+        e.g. [ id:'test', single_end:false ]
   - archive:
-    type: file
-    description: File to be compressed/uncompressed
-    pattern: "*.*"
+      type: file
+      description: File to be compressed/uncompressed
+      pattern: "*.*"
 output:
   - gunzip:
-    type: file
-    description: Compressed/uncompressed file
-    pattern: "*.*"
+      type: file
+      description: Compressed/uncompressed file
+      pattern: "*.*"
   - versions:
-    type: file
-    description: File containing software versions
-    pattern: "versions.yml"
+      type: file
+      description: File containing software versions
+      pattern: "versions.yml"
 authors:
   - "@joseespinosa"
   - "@drpatelh"
   - "@jfy133"
+maintainers:
+  - "@joseespinosa"
+  - "@drpatelh"
+  - "@jfy133"
diff --git a/modules/nf-core/gunzip/tests/main.nf.test b/modules/nf-core/gunzip/tests/main.nf.test
new file mode 100644
index 0000000..6406008
--- /dev/null
+++ b/modules/nf-core/gunzip/tests/main.nf.test
@@ -0,0 +1,36 @@
+nextflow_process {
+
+    name "Test Process GUNZIP"
+    script "../main.nf"
+    process "GUNZIP"
+    tag "gunzip"
+    tag "modules_nfcore"
+    tag "modules"
+
+    test("Should run without failures") {
+
+        when {
+            params {
+                outdir = "$outputDir"
+            }
+            process {
+                """
+                input[0] = Channel.of([
+                        [],
+                        file(params.modules_testdata_base_path + 'genomics/sarscov2/illumina/fastq/test_1.fastq.gz', checkIfExists: true)
+                    ]
+                )
+                """
+            }
+        }
+
+        then {
+            assertAll(
+            { assert process.success },
+            { assert snapshot(process.out).match() }
+            )
+        }
+
+    }
+
+}
diff --git a/modules/nf-core/gunzip/tests/main.nf.test.snap b/modules/nf-core/gunzip/tests/main.nf.test.snap
new file mode 100644
index 0000000..720fd9f
--- /dev/null
+++ b/modules/nf-core/gunzip/tests/main.nf.test.snap
@@ -0,0 +1,31 @@
+{
+    "Should run without failures": {
+        "content": [
+            {
+                "0": [
+                    [
+                        [
+                            
+                        ],
+                        "test_1.fastq:md5,4161df271f9bfcd25d5845a1e220dbec"
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,54376d32aca20e937a4ec26dac228e84"
+                ],
+                "gunzip": [
+                    [
+                        [
+                            
+                        ],
+                        "test_1.fastq:md5,4161df271f9bfcd25d5845a1e220dbec"
+                    ]
+                ],
+                "versions": [
+                    "versions.yml:md5,54376d32aca20e937a4ec26dac228e84"
+                ]
+            }
+        ],
+        "timestamp": "2023-10-17T15:35:37.690477896"
+    }
+}
\ No newline at end of file
diff --git a/modules/nf-core/gunzip/tests/tags.yml b/modules/nf-core/gunzip/tests/tags.yml
new file mode 100644
index 0000000..fd3f691
--- /dev/null
+++ b/modules/nf-core/gunzip/tests/tags.yml
@@ -0,0 +1,2 @@
+gunzip:
+  - modules/nf-core/gunzip/**