diff --git a/config/daliuge.yml b/config/daliuge.yml
index a1c599b..9719b8b 100644
--- a/config/daliuge.yml
+++ b/config/daliuge.yml
@@ -33,12 +33,14 @@ dlg_data_isl_mgr:
   name: "island-mgr"
   flavor: "compute-A"
   image: "CentOS7"
+  user: "centos"
   num_nodes: 1
 
 dlg_node_mgr:
   name: "node-mgr"
   flavor: "compute-A"
   image: "CentOS7"
+  user: "centos"
   num_nodes: 2
 
 # Node group assignments for cluster roles.
diff --git a/config/dask.yml b/config/dask.yml
index 45b0fb7..cc77cfe 100644
--- a/config/dask.yml
+++ b/config/dask.yml
@@ -23,12 +23,14 @@ dask_scheduler:
   name: "control"
   flavor: "compute-A"
   image: "CentOS7-Anaconda3"
+  user: "centos"
   num_nodes: 1
 
 dask_worker:
   name: "worker"
   flavor: "compute-A"
   image: "CentOS7-Anaconda3"
+  user: "centos"
   num_nodes: 2
 
 # Node group assignments for cluster roles.
diff --git a/config/maintenance.yml b/config/maintenance.yml
index 431c60b..201e417 100644
--- a/config/maintenance.yml
+++ b/config/maintenance.yml
@@ -25,30 +25,35 @@ compute_A:
   name: "compute-A"
   flavor: "compute-A"
   image: "CentOS7.4-MAINTENANCE"
+  user: "centos"
   num_nodes: 28
 
 compute_B:
   name: "compute-B"
   flavor: "compute-B"
   image: "CentOS7.4-MAINTENANCE"
+  user: "centos"
   num_nodes: 2
 
 compute_GPU:
   name: "compute-GPU"
   flavor: "compute-GPU"
   image: "CentOS7.4-MAINTENANCE"
+  user: "centos"
   num_nodes: 2
 
 storage_A:
   name: "storage-A"
   flavor: "storage-A"
   image: "CentOS7.4-MAINTENANCE"
+  user: "centos"
   num_nodes: 1
 
 storage_B:
   name: "storage-B"
   flavor: "storage-B"
   image: "CentOS7.4-MAINTENANCE"
+  user: "centos"
   num_nodes: 2
 
 # Node group assignments for cluster roles.
diff --git a/config/openhpc.yml b/config/openhpc.yml
index 3e2fa3f..a36de48 100644
--- a/config/openhpc.yml
+++ b/config/openhpc.yml
@@ -20,23 +20,17 @@ cluster_groups:
 
 slurm_login:
   name: "login"
-<<<<<<< Updated upstream
   flavor: "compute-B"
-=======
-  flavor: "compute-A"
->>>>>>> Stashed changes
   image: "CentOS7.4-OpenHPC"
+  user: "centos"
   num_nodes: 1
 
 slurm_compute:
   name: "compute"
   flavor: "compute-A"
   image: "CentOS7.4-OpenHPC"
-<<<<<<< Updated upstream
-  num_nodes: 2
-=======
+  user: "centos"
   num_nodes: 4
->>>>>>> Stashed changes
 
 # Node group assignments for cluster roles.
 # These group assignments are appended to the cluster inventory file.
diff --git a/config/orangefs.yml b/config/orangefs.yml
index 7017c6d..77efdff 100644
--- a/config/orangefs.yml
+++ b/config/orangefs.yml
@@ -10,17 +10,20 @@ orangefs_meta:
   name: "meta"
   flavor: "storage-A"
   image: "FedoraCore"
+  user: "fedora"
   num_nodes: 1
 
 orangefs_data:
   name: "data"
   flavor: "storage-B"
   image: "FedoraCore"
+  user: "fedora"
   num_nodes: 2
 
 orangefs_client:
   name: "client"
   flavor: "compute-A"
   image: "FedoraCore"
+  user: "fedora"
   num_nodes: 4
 
diff --git a/config/redis.yml b/config/redis.yml
index 99befc7..d323eae 100644
--- a/config/redis.yml
+++ b/config/redis.yml
@@ -23,18 +23,21 @@ redis_master:
   name: "master"
   flavor: "compute-A"
   image: "Ubuntu16"
+  user: "ubuntu"
   num_nodes: 1
 
 redis_slave:
   name: "slave"
   flavor: "compute-A"
   image: "Ubuntu16"
+  user: "ubuntu"
   num_nodes: 3
 
 redis_sentinel:
   name: "sentinel"
   flavor: "compute-A"
   image: "Ubuntu16"
+  user: "ubuntu"
   num_nodes: 3
 
 # Node group assignments for cluster roles.