diff --git a/services/slurmbase/Dockerfile b/services/slurmbase/Dockerfile
index c50920071024f7d6bcb2b043a990ceca7d14bbd8..8fe4fa4e804c50b675c15bc825d8ef01adc05e18 100755
--- a/services/slurmbase/Dockerfile
+++ b/services/slurmbase/Dockerfile
@@ -23,11 +23,11 @@ COPY slurm.conf /etc/slurm-llnl/slurm.conf
 RUN ln -s /var/lib/slurm-llnl /var/lib/slurm-wlm 
 RUN ln -s /var/log/slurm-llnl /var/log/slurm-wlm
 
-# Add slurmtestuser user
-RUN useradd slurmtestuser
-RUN mkdir -p /home/slurmtestuser/.ssh
-RUN cat /rosetta/.ssh/id_rsa.pub >> /home/slurmtestuser/.ssh/authorized_keys
-RUN chown -R slurmtestuser:slurmtestuser /home/slurmtestuser   
+# Add testuser user
+RUN useradd testuser
+RUN mkdir -p /home/testuser/.ssh
+RUN cat /rosetta/.ssh/id_rsa.pub >> /home/testuser/.ssh/authorized_keys
+RUN chown -R testuser:testuser /home/testuser   
 
 # Add prestartup
 COPY prestartup_slurmbase.sh /prestartup/
diff --git a/services/slurmbase/prestartup_slurmbase.sh b/services/slurmbase/prestartup_slurmbase.sh
index 1c2fb8497263e4ffdc38b153b31b5de98ff5d86d..105c137437fd48209cb76875308ce063bb2ed9a9 100644
--- a/services/slurmbase/prestartup_slurmbase.sh
+++ b/services/slurmbase/prestartup_slurmbase.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-# "Deactivate" local slurmtestuser home
-mv /home/slurmtestuser /home_slurmtestuser_vanilla
+# "Deactivate" local testuser home
+mv /home/testuser /home_testuser_vanilla
 
-# Link slurmtestuser against the home in the shared folder (which will be setup by the master node)
-ln -s /shared/home_slurmtestuser /home/slurmtestuser
+# Link testuser against the home in the shared folder (which will be setup by the master node)
+ln -s /shared/home_testuser /home/testuser
diff --git a/services/slurmclustermaster/prestartup_slurmclustermaster.sh b/services/slurmclustermaster/prestartup_slurmclustermaster.sh
index c27ae0145dd62e4db8ef6d407751e230a6212e77..30dee1227b8a8699bfa1a52e453de031f45b417f 100644
--- a/services/slurmclustermaster/prestartup_slurmclustermaster.sh
+++ b/services/slurmclustermaster/prestartup_slurmclustermaster.sh
@@ -4,8 +4,8 @@ set -e
 # Generic rosetta user shared folder
 mkdir -p /shared/rosetta && chown rosetta:rosetta /shared/rosetta
 
-# Shared home for slurmtestuser to simulate a shared home folders filesystem
-cp -a /home_slurmtestuser_vanilla /shared/home_slurmtestuser
+# Shared home for testuser to simulate a shared home folders filesystem
+cp -a /home_testuser_vanilla /shared/home_testuser
 
 # Create shared data directories
 mkdir -p /shared/scratch
@@ -14,5 +14,5 @@ chmod 777 /shared/scratch
 mkdir -p /shared/data/shared
 chmod 777 /shared/data/shared
 
-mkdir -p /shared/data/users/slurmtestuser
-chown slurmtestuser:slurmtestuser /shared/data/users/slurmtestuser
+mkdir -p /shared/data/users/testuser
+chown testuser:testuser /shared/data/users/testuser
diff --git a/services/slurmclusterworker/Dockerfile b/services/slurmclusterworker/Dockerfile
index c98c874420c8e05f2993b6d4e5947cbad4fb4dac..ed8fe56eeacf4e25269f696e023e0fbd8fb05ce4 100755
--- a/services/slurmclusterworker/Dockerfile
+++ b/services/slurmclusterworker/Dockerfile
@@ -4,5 +4,5 @@ MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com>
 # Docker
 RUN apt-get install docker.io -y
 
-# Add slurmtestuser user to sudoers
-RUN adduser slurmtestuser sudo
+# Add testuser user to sudoers
+RUN adduser testuser sudo
diff --git a/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py b/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
index 2ed44a31aff2095e1315a46d10ee47bfed60721e..a9f62bcfebf28836418659783d18df50f049f661 100644
--- a/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
+++ b/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
@@ -298,7 +298,7 @@ to provide help, news and informations on your deployment. Or you can just ignor
                                                             container_engines = ['singularity'])
            
             # Add testuser extra conf for this computing resource
-            testuser.profile.add_extra_conf(conf_type = 'computing_user', object=demo_slurm_computing, value= 'slurmtestuser')
+            testuser.profile.add_extra_conf(conf_type = 'computing_user', object=demo_slurm_computing, value= 'testuser')
 
         #===================== 
         # Storages