diff --git a/modules.json b/modules.json
index 1b4a229..449832c 100644
--- a/modules.json
+++ b/modules.json
@@ -28,7 +28,7 @@
                     },
                     "untar": {
                         "branch": "master",
-                        "git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
+                        "git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d",
                         "installed_by": ["modules"]
                     }
                 }
diff --git a/modules/nf-core/untar/environment.yml b/modules/nf-core/untar/environment.yml
index 0c9cbb1..4f49824 100644
--- a/modules/nf-core/untar/environment.yml
+++ b/modules/nf-core/untar/environment.yml
@@ -1,11 +1,9 @@
 name: untar
-
 channels:
   - conda-forge
   - bioconda
   - defaults
-
 dependencies:
   - conda-forge::grep=3.11
-  - conda-forge::sed=4.7
+  - conda-forge::sed=4.8
   - conda-forge::tar=1.34
diff --git a/modules/nf-core/untar/main.nf b/modules/nf-core/untar/main.nf
index 8a75bb9..9bd8f55 100644
--- a/modules/nf-core/untar/main.nf
+++ b/modules/nf-core/untar/main.nf
@@ -4,8 +4,8 @@ process UNTAR {
 
     conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
-        'nf-core/ubuntu:20.04' }"
+        'https://depot.galaxyproject.org/singularity/ubuntu:22.04' :
+        'nf-core/ubuntu:22.04' }"
 
     input:
     tuple val(meta), path(archive)
@@ -52,8 +52,29 @@ process UNTAR {
     stub:
     prefix    = task.ext.prefix ?: ( meta.id ? "${meta.id}" : archive.toString().replaceFirst(/\.[^\.]+(.gz)?$/, ""))
     """
-    mkdir $prefix
-    touch ${prefix}/file.txt
+    mkdir ${prefix}
+    ## Dry-run untaring the archive to get the files and place all in prefix
+    if [[ \$(tar -taf ${archive} | grep -o -P "^.*?\\/" | uniq | wc -l) -eq 1 ]]; then
+        for i in `tar -tf ${archive}`;
+        do
+            if [[ \$(echo "\${i}" | grep -E "/\$") == "" ]];
+            then
+                touch \${i}
+            else
+                mkdir -p \${i}
+            fi
+        done
+    else
+        for i in `tar -tf ${archive}`;
+        do
+            if [[ \$(echo "\${i}" | grep -E "/\$") == "" ]];
+            then
+                touch ${prefix}/\${i}
+            else
+                mkdir -p ${prefix}/\${i}
+            fi
+        done
+    fi
 
     cat <<-END_VERSIONS > versions.yml
     "${task.process}":
diff --git a/modules/nf-core/untar/tests/main.nf.test b/modules/nf-core/untar/tests/main.nf.test
index 2a7c97b..c957517 100644
--- a/modules/nf-core/untar/tests/main.nf.test
+++ b/modules/nf-core/untar/tests/main.nf.test
@@ -6,6 +6,7 @@ nextflow_process {
     tag "modules"
     tag "modules_nfcore"
     tag "untar"
+
     test("test_untar") {
 
         when {
@@ -19,10 +20,9 @@ nextflow_process {
         then {
             assertAll (
                 { assert process.success },
-                { assert snapshot(process.out.untar).match("test_untar") },
+                { assert snapshot(process.out).match() },
             )
         }
-
     }
 
     test("test_untar_onlyfiles") {
@@ -38,10 +38,48 @@ nextflow_process {
         then {
             assertAll (
                 { assert process.success },
-                { assert snapshot(process.out.untar).match("test_untar_onlyfiles") },
+                { assert snapshot(process.out).match() },
             )
         }
+    }
+
+    test("test_untar - stub") {
+
+        options "-stub"
 
+        when {
+            process {
+                """
+                input[0] = [ [], file(params.modules_testdata_base_path + 'genomics/sarscov2/genome/db/kraken2.tar.gz', checkIfExists: true) ]
+                """
+            }
+        }
+
+        then {
+            assertAll (
+                { assert process.success },
+                { assert snapshot(process.out).match() },
+            )
+        }
     }
 
+    test("test_untar_onlyfiles - stub") {
+
+        options "-stub"
+
+        when {
+            process {
+                """
+                input[0] = [ [], file(params.modules_testdata_base_path + 'generic/tar/hello.tar.gz', checkIfExists: true) ]
+                """
+            }
+        }
+
+        then {
+            assertAll (
+                { assert process.success },
+                { assert snapshot(process.out).match() },
+            )
+        }
+    }
 }
diff --git a/modules/nf-core/untar/tests/main.nf.test.snap b/modules/nf-core/untar/tests/main.nf.test.snap
index 6455029..ceb91b7 100644
--- a/modules/nf-core/untar/tests/main.nf.test.snap
+++ b/modules/nf-core/untar/tests/main.nf.test.snap
@@ -1,42 +1,158 @@
 {
     "test_untar_onlyfiles": {
         "content": [
-            [
-                [
+            {
+                "0": [
                     [
-                        
-                    ],
+                        [
+                            
+                        ],
+                        [
+                            "hello.txt:md5,e59ff97941044f85df5297e1c302d260"
+                        ]
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
+                ],
+                "untar": [
+                    [
+                        [
+                            
+                        ],
+                        [
+                            "hello.txt:md5,e59ff97941044f85df5297e1c302d260"
+                        ]
+                    ]
+                ],
+                "versions": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
+                ]
+            }
+        ],
+        "meta": {
+            "nf-test": "0.8.4",
+            "nextflow": "24.04.3"
+        },
+        "timestamp": "2024-07-10T12:04:28.231047"
+    },
+    "test_untar_onlyfiles - stub": {
+        "content": [
+            {
+                "0": [
+                    [
+                        [
+                            
+                        ],
+                        [
+                            "hello.txt:md5,d41d8cd98f00b204e9800998ecf8427e"
+                        ]
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
+                ],
+                "untar": [
                     [
-                        "hello.txt:md5,e59ff97941044f85df5297e1c302d260"
+                        [
+                            
+                        ],
+                        [
+                            "hello.txt:md5,d41d8cd98f00b204e9800998ecf8427e"
+                        ]
                     ]
+                ],
+                "versions": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
                 ]
-            ]
+            }
         ],
         "meta": {
             "nf-test": "0.8.4",
-            "nextflow": "23.10.1"
+            "nextflow": "24.04.3"
         },
-        "timestamp": "2024-02-28T11:49:41.320643"
+        "timestamp": "2024-07-10T12:04:45.773103"
+    },
+    "test_untar - stub": {
+        "content": [
+            {
+                "0": [
+                    [
+                        [
+                            
+                        ],
+                        [
+                            "hash.k2d:md5,d41d8cd98f00b204e9800998ecf8427e",
+                            "opts.k2d:md5,d41d8cd98f00b204e9800998ecf8427e",
+                            "taxo.k2d:md5,d41d8cd98f00b204e9800998ecf8427e"
+                        ]
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
+                ],
+                "untar": [
+                    [
+                        [
+                            
+                        ],
+                        [
+                            "hash.k2d:md5,d41d8cd98f00b204e9800998ecf8427e",
+                            "opts.k2d:md5,d41d8cd98f00b204e9800998ecf8427e",
+                            "taxo.k2d:md5,d41d8cd98f00b204e9800998ecf8427e"
+                        ]
+                    ]
+                ],
+                "versions": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
+                ]
+            }
+        ],
+        "meta": {
+            "nf-test": "0.8.4",
+            "nextflow": "24.04.3"
+        },
+        "timestamp": "2024-07-10T12:04:36.777441"
     },
     "test_untar": {
         "content": [
-            [
-                [
+            {
+                "0": [
                     [
-                        
-                    ],
+                        [
+                            
+                        ],
+                        [
+                            "hash.k2d:md5,8b8598468f54a7087c203ad0190555d9",
+                            "opts.k2d:md5,a033d00cf6759407010b21700938f543",
+                            "taxo.k2d:md5,094d5891cdccf2f1468088855c214b2c"
+                        ]
+                    ]
+                ],
+                "1": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
+                ],
+                "untar": [
                     [
-                        "hash.k2d:md5,8b8598468f54a7087c203ad0190555d9",
-                        "opts.k2d:md5,a033d00cf6759407010b21700938f543",
-                        "taxo.k2d:md5,094d5891cdccf2f1468088855c214b2c"
+                        [
+                            
+                        ],
+                        [
+                            "hash.k2d:md5,8b8598468f54a7087c203ad0190555d9",
+                            "opts.k2d:md5,a033d00cf6759407010b21700938f543",
+                            "taxo.k2d:md5,094d5891cdccf2f1468088855c214b2c"
+                        ]
                     ]
+                ],
+                "versions": [
+                    "versions.yml:md5,6063247258c56fd271d076bb04dd7536"
                 ]
-            ]
+            }
         ],
         "meta": {
             "nf-test": "0.8.4",
-            "nextflow": "23.10.1"
+            "nextflow": "24.04.3"
         },
-        "timestamp": "2024-02-28T11:49:33.795172"
+        "timestamp": "2024-07-10T12:04:19.377674"
     }
 }
\ No newline at end of file