diff --git a/scripts/install b/scripts/install
index 6388201..932601b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -38,13 +38,13 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 # Download, check integrity, uncompress and patch the source from manifest.toml
 ynh_setup_source --dest_dir="$install_dir/app"
 
-mkdir /home/borgwarehouse
-mkdir /home/borgwarehouse/.ssh && chmod 700 /home/borgwarehouse/.ssh
-touch /home/borgwarehouse/.ssh/authorized_keys && chmod 600 /home/borgwarehouse/.ssh/authorized_keys
+mkdir /home/$app
+mkdir /home/$app/.ssh && chmod 700 /home/$app/.ssh
+touch /home/$app/.ssh/authorized_keys && chmod 600 /home/$app/.ssh/authorized_keys
 mkdir $install_dir/repos && chmod 700 $install_dir/repos
 
 chown -R $app:www-data "$install_dir"
-chown -R $app:www-data "/home/borgwarehouse"
+chown -R $app:www-data "/home/$app"
 chmod 700 $install_dir/app/helpers/shells/*
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 3ec7dc4..3bc3d9b 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -31,6 +31,8 @@ ynh_remove_nodejs
 
 ynh_secure_remove --file="/etc/cron.d/$app"
 
+ynh_secure_remove --file="/home/$app"
+
 #=================================================
 # END OF SCRIPT
 #=================================================