diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index cced44b32045aac80408fba41ef191f3c4f2f4d9..9598c164cd5fff095c48fbfd0293590f017f8568 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,6 +1,6 @@
 set(GEOMETRY_VERSION 6b0ed9654327dfdeccdab4bedc87040d3b4ddcc7)
 
-set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
+set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/f.uhlig/cbmroot_geometry.git")
 
 download_project_if_needed(PROJECT         Geometry_source
                            GIT_REPOSITORY  ${GEOMETRY_SRC_URL}
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 77309f5222d7180abc8af99ca2ce0548c79c602e..4d06bb6bb47d79875e2092a3f54c872cfd47e8c8 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,6 +1,6 @@
 set(PARAMETER_VERSION 9835279a7166989062eab6654af7e9c256028106)
 
-set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
+set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/f.uhlig/cbmroot_parameter.git")
 
 download_project_if_needed(PROJECT         Parameter_source
                            GIT_REPOSITORY  ${PARAMETER_SRC_URL}
diff --git a/macro/CMakeLists.txt b/macro/CMakeLists.txt
index 393fc63212a97933f059d0a3ae30e895407a6eb0..d0c4b16e2e603b154d560d39bb6111e710836a27 100644
--- a/macro/CMakeLists.txt
+++ b/macro/CMakeLists.txt
@@ -1,22 +1,22 @@
 #--- Tests for continuous builds
 add_subdirectory(run)
-add_subdirectory(mcbm)
-add_subdirectory(mvd)
-add_subdirectory(much)
-add_subdirectory(include)
-add_subdirectory (reco)
+#add_subdirectory(mcbm)
+#add_subdirectory(mvd)
+#add_subdirectory(much)
+#add_subdirectory(include)
+#add_subdirectory (reco)
 
 #--- Additional tests for nightly builds
 If(NOT ${CBM_TEST_MODEL} MATCHES Experimental)
-  add_subdirectory(field)
-  add_subdirectory(C2F)
-  add_subdirectory(dimuon)
+#  add_subdirectory(field)
+#  add_subdirectory(C2F)
+#  add_subdirectory(dimuon)
   Message("Additional Nightly tests")
 EndIf()
 
 #--- Additional tests for weekly builds
 If(${CBM_TEST_MODEL} MATCHES Weekly)
-  add_subdirectory(KF)
+#  add_subdirectory(KF)
   Message("Additional long running Weekly tests")
 EndIf()
 
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index e30e0ec8425505c78bc9ce861620ade5675a3c74..f5e0af7ed7ca187ad559fd6d9bd000e74987481a 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -40,14 +40,14 @@ math(EXPR nBeam "${nEvents} * 3")
 # =====   Define the different setups to be tested with   ====================
 if(NOT ${CBM_TEST_MODEL} MATCHES Experimental )
   List(APPEND cbm_setup
-	sis100_hadron
-        sis100_electron
-	sis100_muon_lmvm
-        sis100_muon_jpsi
-	sis300_electron
+#	sis100_hadron
+        sis100_test
+#	sis100_muon_lmvm
+#        sis100_muon_jpsi
+#	sis300_electron
 	)
 else()
-  List(APPEND cbm_setup sis100_electron sis100_muon_jpsi)
+  List(APPEND cbm_setup sis100_test)
 endif()
 # ============================================================================
 
@@ -70,6 +70,8 @@ foreach(setup IN LISTS cbm_setup)
         set(sname s100h)
   elseif(setup MATCHES sis100_electron)
         set(sname s100e)
+  elseif(setup MATCHES sis100_test)
+        set(sname s100t)
   elseif(setup MATCHES sis100_muon_lmvm)
 	set(sname s100m2)
   elseif(setup MATCHES sis100_muon_jpsi)