diff --git a/conf/uppmax.config b/conf/uppmax.config
index 9655ea7..e9340f8 100644
--- a/conf/uppmax.config
+++ b/conf/uppmax.config
@@ -1,12 +1,14 @@
 // UPPMAX Config Profile
 params {
-  config_profile_description = 'UPPMAX (Rackham/Bianca) cluster profile provided by nf-core/configs.'
+  // Description is overwritten for other clusters below
+  config_profile_description = 'UPPMAX (Bianca) cluster profile provided by nf-core/configs.'
   config_profile_contact = 'Phil Ewels (@ewels)'
   config_profile_url = 'https://www.uppmax.uu.se/'
   project = null
   clusterOptions = null
   schema_ignore_params = "genomes,input_paths,cluster-options,clusterOptions,project"
   save_reference = true
+  // Defaults set for Bianca - other clusters set below
   max_memory = 500.GB
   max_cpus = 16
   max_time = 240.h
@@ -60,22 +62,32 @@ process {
   scratch = '$SNIC_TMP'
 }
 
-if (hostname.startsWith("s")) {
+// Cluster: Snowy
+//   Caution: Bianca nodes will be project name-nodenumber, e.g. sens2021500-001
+//   so cannot rely on just starting with 's'
+if (hostname ==~ "s[0-9][0-9]*") {
   params.max_time = 700.h
   params.max_memory = 3880.GB
   params.config_profile_description = 'UPPMAX (Snowy) cluster profile provided by nf-core/configs.'
 }
 
+// Cluster: Irma
 if (hostname.startsWith("i")) {
   params.max_memory = 250.GB
   params.config_profile_description = 'UPPMAX (Irma) cluster profile provided by nf-core/configs.'
 }
 
+// Cluster: Rackham
 if (hostname.startsWith("r")) {
   params.max_cpus = 20
   params.max_memory = 970.GB
+  params.config_profile_description = 'UPPMAX (Rackham) cluster profile provided by nf-core/configs.'
 }
 
+// Cluster: Bianca - set in initial params block above
+
+// Additional devel profile for running in devel queue
+// Run with `-profile upppmax,devel`
 profiles {
   devel {
     params {