diff --git a/src/classes/PStartupHandler.cpp b/src/classes/PStartupHandler.cpp
index 89945aa63..18a46882f 100644
--- a/src/classes/PStartupHandler.cpp
+++ b/src/classes/PStartupHandler.cpp
@@ -752,9 +752,8 @@ void PStartupHandler::OnCdataBlock(const Char_t *str, Int_t len)
  *
  * <b>Default Data Paths:</b>
  * Standard PSI facility data directories:
- * - /mnt/data/nemu/his, /mnt/data/nemu/wkm
- * - /afs/psi.ch/project/nemu/data/his, /afs/psi.ch/project/nemu/data/wkm
- * - /afs/psi.ch/project/bulkmusr/data/gps, dolly, gpd, ltf, alc
+ * - /mnt/data/nemu/his
+ * - /psi.ch/group/lmu/public/data/XXX/his/, where XXX=lem, alc, dolly, flame, gpd, gps, hal, ltf, or vms
  *
  * <b>Default Markers:</b>
  * ROOT TMarker style codes for distinguishing multiple data sets:
@@ -781,14 +780,16 @@ void PStartupHandler::CheckLists()
   // check if any data path is given
   if (fDataPathList.size() == 0) {
     fDataPathList.push_back(TString("/mnt/data/nemu/his"));
-    fDataPathList.push_back(TString("/mnt/data/nemu/wkm"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/nemu/data/his"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/nemu/data/wkm"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/gps"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/dolly"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/gpd"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/ltf"));
-    fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/alc"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/lem/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/alc/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/dolly/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/flame/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/gpd/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/gps/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/hal/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/ltf/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/misc/his/"));
+    fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/vms/his/"));
   }
 
   // check if any markers are given
@@ -877,7 +878,7 @@ Bool_t PStartupHandler::StartupFileExists(Char_t *fln)
  *
  * <b>Data Paths:</b>
  * - PSI LEM, GPS, GPD, Dolly, Flame, HIFI, LTF, ALC data directories
- * - Both local mount points and AFS paths
+ * - Both local mount points and NFS paths
  *
  * <b>Run Name Templates:</b>
  * - Templates for all PSI μSR instruments (GPS, GPD, Dolly, Flame, etc.)
@@ -946,25 +947,22 @@ Bool_t PStartupHandler::WriteDefaultStartupFile(bool reset_startup_file)
 
   // write default musrfit_startup.xml
   fout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << std::endl;
-  fout << "<musrfit xmlns=\"http://lmu.web.psi.ch/musrfit/user/MUSR/WebHome.html\">" << std::endl;
+  fout << "<musrfit xmlns=\"https://lmu.pages.psi.ch/musrfit-docu/\">" << std::endl;
   fout << "    <comment>" << std::endl;
   fout << "        Defines default settings for the musrfit package" << std::endl;
   fout << "    </comment>" << std::endl;
   fout << "    <!-- the use_dks flag is only for the GPU Fourier support, not the fitting -->" << std::endl;
   fout << "    <use_dks>no</use_dks>" << std::endl;
   fout << "    <data_path>/psi.ch/group/lmu/public/data/lem/his</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/nemu/data/his</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/nemu/data/wkm</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/misc</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/gps</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/dolly</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/gpd</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/ltf</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/alc/td</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/hifi</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/lem</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/flame</data_path>" << std::endl;
-  fout << "    <data_path>/afs/psi.ch/project/bulkmusr/data/vms</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/alc/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/dolly/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/flame/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/gpd/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/gps/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/hal/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/ltf/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/misc/his</data_path>" << std::endl;
+  fout << "    <data_path>/psi.ch/group/lmu/public/data/vms/his</data_path>" << std::endl;
   fout << "    <!-- MISC/PSI 1985 - 1990 -->" << std::endl;
   fout << "    <run_name_template inst=\"misc\">d%yyyy%/deltat_misc_%rrrr%.bin</run_name_template>" << std::endl;
   fout << "    <!-- ALC TD/PSI -->" << std::endl;
diff --git a/src/external/MagProximity/mag_proximity_startup.xml b/src/external/MagProximity/mag_proximity_startup.xml
index 402ac07e7..3969b88a8 100644
--- a/src/external/MagProximity/mag_proximity_startup.xml
+++ b/src/external/MagProximity/mag_proximity_startup.xml
@@ -4,7 +4,7 @@
       contains meta file infromation of the needed trim.sp files.
     </comment>
     <trim_sp>
-        <data_path>/afs/psi.ch/project/nemu/analysis/2010/EuS-Co/trimsp2</data_path>
+        <data_path>/psi.ch/group/lmu/public/analysis/lem/2010/EuS-Co/trimsp2</data_path>
         <rge_fln_pre>EuS-Co_E</rge_fln_pre>
         <energy_list>
             <energy>5030</energy>
diff --git a/src/tests/nonlocal/In_37_T2P83_E14P1.inp b/src/tests/nonlocal/In_37_T2P83_E14P1.inp
index 337c32424..b3fbb201b 100644
--- a/src/tests/nonlocal/In_37_T2P83_E14P1.inp
+++ b/src/tests/nonlocal/In_37_T2P83_E14P1.inp
@@ -20,6 +20,6 @@ filmThickness = 300000.0
 specular = 1
 Bext = 41.19
 deadLayer = 5.76
-%rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSne141.rge
+%rgeFileName = /psi.ch/group/lmu/public/analysis/lem/2009/Nonlocal/trimsp/InSne141.rge 
 outputFileName =  In_37_T2P83_E14P1.dat
 
diff --git a/src/tests/nonlocal/nonlocal.cpp b/src/tests/nonlocal/nonlocal.cpp
index 191ab58d4..82af57dde 100644
--- a/src/tests/nonlocal/nonlocal.cpp
+++ b/src/tests/nonlocal/nonlocal.cpp
@@ -48,8 +48,8 @@ void syntax()
   cout << endl << "specular = 1";
   cout << endl << "Bext = 47.14";
   cout << endl << "deadLayer = 0.4";
-  cout << endl << "rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSn_E6000.rge";
-  cout << endl << "rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSn_E14100.rge";
+  cout << endl << "rgeFileName = /psi.ch/group/lmu/public/analysis/lem/2009/Nonlocal/trimsp/InSn_E6000.rge";
+  cout << endl << "rgeFileName = /psi.ch/group/lmu/public/analysis/lem/2009/Nonlocal/trimsp/InSn_E14100.rge";
   cout << endl << "outputFileName = In_37_T2P83.dat";
   cout << endl << "outputFileNameBmean = In_37_T2P83_Bmean.dat";
   cout << endl << endl;