diff --git a/conf/modules.config b/conf/modules.config
index 09fbff1fc..67e030eef 100644
--- a/conf/modules.config
+++ b/conf/modules.config
@@ -47,6 +47,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/preprocessing/fastqc_raw/" },
             mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -57,6 +58,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/preprocessing/fastqc_processed/" },
             mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -76,6 +78,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/preprocessing/falco_raw/" },
             mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -86,6 +89,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/preprocessing/falco_processed/" },
             mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -103,13 +107,13 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_L${meta.lane}" }
         publishDir = [
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/fastp" },
                 mode: params.publish_dir_mode,
                 pattern: '*.fastq.gz',
                 enabled: params.preprocessing_savepreprocessedreads
             ],
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/fastp" },
                 mode: params.publish_dir_mode,
                 pattern: '*.{log,html,json}'
             ]
@@ -133,13 +137,13 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_L${meta.lane}" }
         publishDir = [
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/fastp" },
                 mode: params.publish_dir_mode,
                 pattern: '*.fastq.gz',
                 enabled: params.preprocessing_savepreprocessedreads
             ],
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/fastp" },
                 mode: params.publish_dir_mode,
                 pattern: '*.{log,html,json}'
             ]
@@ -165,13 +169,13 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_L${meta.lane}" }
         publishDir = [
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/adapterremoval" },
                 mode: params.publish_dir_mode,
                 pattern: '*.fastq.gz',
                 enabled: params.preprocessing_savepreprocessedreads
             ],
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/adapterremoval" },
                 mode: params.publish_dir_mode,
                 pattern: '*.settings'
             ]
@@ -199,13 +203,13 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_L${meta.lane}" }
         publishDir = [
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/adapterremoval" },
                 mode: params.publish_dir_mode,
                 pattern: '*.fastq.gz',
                 enabled: params.preprocessing_savepreprocessedreads
             ],
             [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/adapterremoval" },
                 mode: params.publish_dir_mode,
                 pattern: '*.settings'
             ]
@@ -216,7 +220,7 @@ process {
         tag = { "${meta.sample_id}_${meta.library_id}_L${meta.lane}_${meta.reference}" }
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_L${meta.lane}_${meta.reference}" }
         publishDir = [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/preprocessing/adapterremoval" },
                 mode: params.publish_dir_mode,
                 pattern: '*.fastq.gz',
                 enabled: params.preprocessing_savepreprocessedreads
@@ -335,7 +339,7 @@ process {
         tag = { "${meta.sample_id}_${meta.library_id}_${meta.reference}" }
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_${meta.reference}" }
         publishDir = [
-                path: { "${params.outdir}/preprocessing" },
+                path: { "${params.outdir}/bam_filtering/" },
                 mode: params.publish_dir_mode,
                 pattern: '*.fastq.gz',
                 enabled: params.preprocessing_savepreprocessedreads
@@ -704,7 +708,8 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_${meta.reference}" }
         publishDir = [
             path: { "${params.outdir}/mapstats/preseq" },
-            mode: params.publish_dir_mode
+            mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -722,7 +727,8 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.library_id}_${meta.reference}" }
         publishDir = [
             path: { "${params.outdir}/mapstats/preseq" },
-            mode: params.publish_dir_mode
+            mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -742,7 +748,8 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.reference}_depth" }
         publishDir = [
             path: { "${params.outdir}/mapstats/bedtools" },
-            mode: params.publish_dir_mode
+            mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -752,7 +759,8 @@ process {
         ext.prefix = { "${meta.sample_id}_${meta.reference}_breadth" }
         publishDir = [
             path: { "${params.outdir}/mapstats/bedtools" },
-            mode: params.publish_dir_mode
+            mode: params.publish_dir_mode,
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -862,7 +870,7 @@ process {
             path: { "${params.outdir}/damage_manipulation/" },
             mode: params.publish_dir_mode,
             pattern: '*.{bai,csi}'
-            ]
+        ]
     }
 
     //
@@ -1066,9 +1074,9 @@ process {
     withName: 'QUALIMAP_BAMQC_WITHBED|QUALIMAP_BAMQC_NOBED' {
         tag = { "${meta.reference}|${meta.sample_id}" }
         publishDir = [
-            path: { "${params.outdir}/mapstats/qualimap/${meta.reference}/${meta.sample_id}/}" },
+            path: { "${params.outdir}/mapstats/qualimap/${meta.reference}/" },
             mode: params.publish_dir_mode,
-            enabled: true
+            pattern: '*[!versions.yml]',
         ]
     }
 
@@ -1086,7 +1094,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/damage_estimation/damageprofiler/" },
             mode: params.publish_dir_mode,
-            enabled: true
+            pattern: '*[!versions.yml]'
         ]
     }
 
@@ -1115,7 +1123,7 @@ process {
         ext.prefix = { "${meta2.id}_samtoolsdepth" }
         ext.args = '-aa -q30 -Q30 -H'
         publishDir = [
-        enabled: false
+            enabled: false
         ]
     }
 
@@ -1250,8 +1258,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.{geno,snp,ind}'
+            pattern: '*.{geno,snp,ind}',
         ]
     }
 
@@ -1262,8 +1269,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.{tsv}'
+            pattern: '*.{tsv}',
         ]
     }
 
@@ -1285,9 +1291,9 @@ process {
         ].join(' ').trim()
         ext.prefix = { "${meta.sample_id}_${meta.reference}_realigned" }
         publishDir = [
+            enabled: params.genotyping_gatk_ug_keeprealignbam,
             path: { "${params.outdir}/genotyping/IndelRealigner" },
             mode: params.publish_dir_mode,
-            enabled: params.genotyping_gatk_ug_keeprealignbam,
             pattern: '*.{bam,bai}'
         ]
     }
@@ -1306,8 +1312,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.vcf.gz'
+            pattern: '*.vcf.gz',
         ]
     }
 
@@ -1318,8 +1323,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.vcf.gz.tbi'
+            pattern: '*.vcf.gz.tbi',
         ]
     }
 
@@ -1336,8 +1340,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.{vcf.gz,vcf.gz.tbi}'
+            pattern: '*.{vcf.gz,vcf.gz.tbi}',
         ]
     }
 
@@ -1352,8 +1355,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.vcf.gz'
+            pattern: '*.vcf.gz',
         ]
     }
 
@@ -1364,8 +1366,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.vcf.gz.tbi'
+            pattern: '*.vcf.gz.tbi',
         ]
     }
 
@@ -1375,8 +1376,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.txt'
+            pattern: '*.txt',
         ]
     }
 
@@ -1395,8 +1395,7 @@ process {
         publishDir = [
             path: { "${params.outdir}/genotyping/" },
             mode: params.publish_dir_mode,
-            enabled: true,
-            pattern: '*.{glf,beagle}.gz'
+            pattern: '*.{glf,beagle}.gz',
         ]
     }
 }