diff --git a/.github/workflows/nf-test.yml b/.github/workflows/nf-test.yml
index 6b5932791ac1..27b15b09ecb9 100644
--- a/.github/workflows/nf-test.yml
+++ b/.github/workflows/nf-test.yml
@@ -77,7 +77,7 @@ jobs:
         env:
           NFT_VER: ${{ env.NFT_VER }}
         with:
-          max_shards: 15
+          max_shards: 30
           paths: "${{ join(fromJson(steps.list.outputs.components ), ' ') }}"
 
       - name: debug
diff --git a/modules/nf-core/untar/main.nf b/modules/nf-core/untar/main.nf
index e712ebe63ab5..a09bb007063a 100644
--- a/modules/nf-core/untar/main.nf
+++ b/modules/nf-core/untar/main.nf
@@ -30,6 +30,7 @@ process UNTAR {
     if [[ \$(tar -taf ${archive} | grep -o -P "^.*?\\/" | uniq | wc -l) -eq 1 ]]; then
         tar \\
             -C ${prefix} --strip-components 1 \\
+            --no-same-owner \\
             -xavf \\
             ${args} \\
             ${archive} \\
@@ -37,6 +38,7 @@ process UNTAR {
     else
         tar \\
             -C ${prefix} \\
+            --no-same-owner \\
             -xavf \\
             ${args} \\
             ${archive} \\