diff --git a/tools/logon.cmd b/tools/logon.cmd
index ef5fbbd..666f7e5 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -218,7 +218,7 @@ if %install_aerolite% == 1 (
 echo Creating workspace folder ...
 mkdir "%USERPROFILE%"\workspace 1>nul 2>nul
 
-echo Setting up SSH client ...
+echo Setting up SSH client config ...
 mkdir "%USERPROFILE%"\.ssh 1>nul 2>nul
 copy /Y %TOOLS%\scripts\config\ssh-config.txt "%USERPROFILE%"\.ssh\config 1>nul 2>nul
 
@@ -263,7 +263,6 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" ^
   /v "ShowSecondsInSystemClock" /t REG_DWORD /d 1 /f 1>nul
 
 echo Setting the "GLOBAL" view mode for windows EXPLORER ...
-echo.
 powershell -command %TOOLS%\scripts\set-explorer-viewmode.ps1
 echo.
 
@@ -503,6 +502,18 @@ rem ===========
 rem USER RIGHTS
 rem ===========
 
+if "%HOMEDRIVE%%HOMEPATH%" NEQ "%USERPROFILE%" (
+  echo Creating workspace folder (domain drive)...
+  mkdir "%HOMEDRIVE%%HOMEPATH%"\workspace 1>nul 2>nul
+
+  echo Setting up SSH client config (domain drive)...
+  mkdir "%HOMEDRIVE%\%HOMEPATH%"\.ssh 1>nul 2>nul
+  copy /Y %TOOLS%\scripts\config\ssh-config.txt "%HOMEDRIVE%%HOMEPATH%"\.ssh\config 1>nul 2>nul
+
+  echo Installing a VIM configuration (domain drive)...
+  copy /Y %TOOLS%\scripts\config\vimrc.txt "%HOMEDRIVE%%HOMEPATH%"\.vimrc 1>nul 2>nul
+)
+
 echo.
 echo Cleaning users home directory
 echo ########################################
diff --git a/tools/personalfiles.cmd b/tools/personalfiles.cmd
index 17c4e36..e95fced 100644
--- a/tools/personalfiles.cmd
+++ b/tools/personalfiles.cmd
@@ -88,14 +88,25 @@ rem SSH keys ...
 if EXIST %GITWORKDIR%\%gitrepo% (
   echo copying users SSH keys ...
   copy /Y %GITWORKDIR%\%gitrepo%\id*.* %USERPROFILE%\.ssh 2>nul
+
+  if "%HOMEDRIVE%%HOMEPATH%" NEQ "%USERPROFILE%" (
+    echo copying users gitconfig (domain drive) ...
+    copy /Y %GITWORKDIR%\%gitrepo%\id*.* "%HOMEDRIVE%%HOMEPATH%"\.ssh 2>nul
+  )
 )
 
-rem GIT
+rem GITCONFIG ...
 if EXIST %GITWORKDIR%\%gitrepo%\gitconfig (
   echo copying users gitconfig ...
   copy /Y %GITWORKDIR%\%gitrepo%\gitconfig %USERPROFILE%\.gitconfig
+
+  if "%HOMEDRIVE%%HOMEPATH%" NEQ "%USERPROFILE%" (
+    echo copying users gitconfig (domain drive) ...
+    copy /Y %GITWORKDIR%\%gitrepo%\gitconfig "%HOMEDRIVE%%HOMEPATH%"\.gitconfig
+  )
 )
 
+
 rem create a statusfile (this codeblock must be executed only once per user) ...
 echo 1 >%PERSONALFILES_DONE%