diff --git a/CHANGELOG.md b/CHANGELOG.md
index 950322d87..887f41b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Template
 
+- Rename Nextflow tower badge, fix pipeline name and white space errors in template ([#2785](https://github.com/nf-core/tools/pull/2785)) and ([#2786](https://github.com/nf-core/tools/pull/2786))
+
 ### Linting
 
 ### Components
diff --git a/nf_core/pipeline-template/workflows/pipeline.nf b/nf_core/pipeline-template/workflows/pipeline.nf
index 68adbaa32..7cd070301 100644
--- a/nf_core/pipeline-template/workflows/pipeline.nf
+++ b/nf_core/pipeline-template/workflows/pipeline.nf
@@ -40,7 +40,7 @@ workflow {{ short_name|upper }} {
     // Collate and save software versions
     //
     softwareVersionsToYAML(ch_versions)
-        .collectFile(storeDir: "${params.outdir}/pipeline_info", name: 'nf_core_pipeline_software_mqc_versions.yml', sort: true, newLine: true)
+        .collectFile(storeDir: "${params.outdir}/pipeline_info", name: 'nf_core_{{ short_name }}_software_mqc_versions.yml', sort: true, newLine: true)
         .set { ch_collated_versions }
 
     //