diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml
index 3135180c..5600fcf9 100644
--- a/.github/workflows/awsfulltest.yml
+++ b/.github/workflows/awsfulltest.yml
@@ -29,6 +29,3 @@ jobs:
               "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/viralrecon/results-${{ github.sha }}/platform_${{ matrix.platform }}"
             }
           profiles: test_full_${{ matrix.platform }},aws_tower
-          nextflow_config: |
-            process.errorStrategy = 'retry'
-            process.maxRetries = 3
diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml
index f9631c28..a3ce4a0a 100644
--- a/.github/workflows/awstest.yml
+++ b/.github/workflows/awstest.yml
@@ -23,6 +23,3 @@ jobs:
               "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/viralrecon/results-test-${{ github.sha }}"
             }
           profiles: test,aws_tower
-          nextflow_config: |
-            process.errorStrategy = 'retry'
-            process.maxRetries = 3
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..5124c9ac
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,8 @@
+.nextflow*
+work/
+data/
+results/
+.DS_Store
+testing/
+testing*
+*.pyc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56f5432d..a8d65c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Enhancements & fixes
 
+- Updated pipeline template to [nf-core/tools 2.3.2](https://github.com/nf-core/tools/releases/tag/2.3.2)
+
 ### Parameters
 
 ## [[2.4.1](https://github.com/nf-core/viralrecon/releases/tag/2.4.1)] - 2022-03-01
diff --git a/README.md b/README.md
index 8aa66dc3..dbc0a07d 100644
--- a/README.md
+++ b/README.md
@@ -99,11 +99,64 @@ A number of improvements were made to the pipeline recently, mainly with regard
 
 4. Start running your own analysis!
 
-   <!-- TODO nf-core: Update the example "typical command" below used to run the pipeline -->
-
-   ```console
-   nextflow run nf-core/viralrecon --input samplesheet.csv --outdir <OUTDIR> --genome GRCh37 -profile <docker/singularity/podman/shifter/charliecloud/conda/institute>
-   ```
+   - Typical command for Illumina shotgun analysis:
+
+     ```bash
+     nextflow run nf-core/viralrecon \
+         --input samplesheet.csv \
+         --outdir <OUTDIR> \
+         --platform illumina \
+         --protocol metagenomic \
+         --genome 'MN908947.3' \
+         -profile <docker/singularity/podman/conda/institute>
+     ```
+
+   - Typical command for Illumina amplicon analysis:
+
+     ```bash
+     nextflow run nf-core/viralrecon \
+         --input samplesheet.csv \
+         --outdir <OUTDIR> \
+         --platform illumina \
+         --protocol amplicon \
+         --genome 'MN908947.3' \
+         --primer_set artic \
+         --primer_set_version 3 \
+         --skip_assembly \
+         -profile <docker/singularity/podman/conda/institute>
+     ```
+
+   - Typical command for Nanopore amplicon analysis:
+
+     ```bash
+     nextflow run nf-core/viralrecon \
+         --input samplesheet.csv \
+         --outdir <OUTDIR> \
+         --platform nanopore \
+         --genome 'MN908947.3' \
+         --primer_set_version 3 \
+         --fastq_dir fastq_pass/ \
+         --fast5_dir fast5_pass/ \
+         --sequencing_summary sequencing_summary.txt \
+         -profile <docker/singularity/podman/conda/institute>
+     ```
+
+   - An executable Python script called [`fastq_dir_to_samplesheet.py`](https://github.com/nf-core/viralrecon/blob/master/bin/fastq_dir_to_samplesheet.py) has been provided if you are using `--platform illumina` and would like to auto-create an input samplesheet based on a directory containing FastQ files **before** you run the pipeline (requires Python 3 installed locally) e.g.
+
+     ```console
+     wget -L https://raw.githubusercontent.com/nf-core/viralrecon/master/bin/fastq_dir_to_samplesheet.py
+     ./fastq_dir_to_samplesheet.py <FASTQ_DIR> samplesheet.csv
+     ```
+
+   - You can find the default keys used to specify `--genome` in the [genomes config file](https://github.com/nf-core/configs/blob/master/conf/pipeline/viralrecon/genomes.config). This provides default options for
+
+     - Reference genomes (including SARS-CoV-2)
+     - Genome associates primer sets
+     - [Nextclade datasets](https://docs.nextstrain.org/projects/nextclade/en/latest/user/datasets.html)
+
+       The Pangolin and Nextclade lineage and clade definitions change regularly as new SARS-CoV-2 lineages are discovered. For instructions to use more recent versions of lineage analysis tools like Pangolin and Nextclade please refer to the [updating containers](https://nf-co.re/viralrecon/usage#updating-containers) section in the usage docs.
+
+     Where possible we are trying to collate links and settings for standard primer sets to make it easier to run the pipeline with standard keys; see [usage docs](https://nf-co.re/viralrecon/usage#illumina-primer-sets).
 
 ## Documentation
 
diff --git a/subworkflows/local/input_check.nf b/subworkflows/local/input_check.nf
index 35f79aac..9d83d9f1 100644
--- a/subworkflows/local/input_check.nf
+++ b/subworkflows/local/input_check.nf
@@ -21,7 +21,7 @@ workflow INPUT_CHECK {
             .out
             .csv
             .splitCsv ( header:true, sep:',' )
-            .map { create_fastq_channels(it) }
+            .map { create_fastq_channel(it) }
             .set { sample_info }
     } else if (platform == 'nanopore') {
         SAMPLESHEET_CHECK