diff --git a/install/dfall_install_ros_kinetic_ubuntu16.sh b/install/dfall_install_ros_kinetic_ubuntu16.sh
index 50491079ddb050cd0b54d94b8834af017591f12a..1822a0ec9d97dec3cc605b3830940ae27b10263e 100755
--- a/install/dfall_install_ros_kinetic_ubuntu16.sh
+++ b/install/dfall_install_ros_kinetic_ubuntu16.sh
@@ -154,9 +154,9 @@ echo "# ADDED AS PART OF THE D-FaLL-System INSTALLATION" >> ~/.bashrc
 
 # Add an evironment variable that point to the D-FaLL-System Repository
 echo "# Environment variable for the home directory" >> ~/.bashrc
-echo "export DFALL_HOME=\"/home/agent01/work/D-FaLL-System\"" >> ~/.bashrc
+echo "export DFALL_HOME=\"/home/$USER/work/D-FaLL-System\"" >> ~/.bashrc
 # And set the environment variable for this terminal session
-export DFALL_HOME="/home/agent01/work/D-FaLL-System"
+export DFALL_HOME="/home/$USER/work/D-FaLL-System"
 
 # Add the ROS environment setup to the .bashrc
 echo "# Source the ROS setup" >> ~/.bashrc
diff --git a/install/dfall_install_ros_melodic_ubuntu18.sh b/install/dfall_install_ros_melodic_ubuntu18.sh
index 4ff3edc96442506a038256a6fbf948e89de7ced9..1dd32f5e791cd797b0660dccab0f645d3000d817 100755
--- a/install/dfall_install_ros_melodic_ubuntu18.sh
+++ b/install/dfall_install_ros_melodic_ubuntu18.sh
@@ -154,9 +154,9 @@ echo "# ADDED AS PART OF THE D-FaLL-System INSTALLATION" >> ~/.bashrc
 
 # Add an evironment variable that point to the D-FaLL-System Repository
 echo "# Environment variable for the home directory" >> ~/.bashrc
-echo "export DFALL_HOME=\"/home/agent01/work/D-FaLL-System\"" >> ~/.bashrc
+echo "export DFALL_HOME=\"/home/$USER/work/D-FaLL-System\"" >> ~/.bashrc
 # And set the environment variable for this terminal session
-export DFALL_HOME="/home/agent01/work/D-FaLL-System"
+export DFALL_HOME="/home/$USER/work/D-FaLL-System"
 
 # Add the ROS environment setup to the .bashrc
 echo "# Source the ROS setup" >> ~/.bashrc