diff --git a/default.xml b/default.xml
index c1eb7989898f2ce9277b7fdca8ef48b2fbf783cb..dfef3ca238d04712fdda1d800d79526bfccc6674 100644
--- a/default.xml
+++ b/default.xml
@@ -2,8 +2,10 @@
 <manifest>
 
   <remote  name="aosp"
-           fetch=".."
+           fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
+  <remote  name="matombo"
+           fetch="ssh://git@gitlab.cs.fau.de/matombo" />
   <default revision="refs/tags/android-7.1.2_r28"
            remote="aosp"
            sync-j="4" />
@@ -522,7 +524,7 @@
   <project path="system/connectivity/apmanager" name="platform/system/connectivity/apmanager" />
   <project path="system/connectivity/dhcp_client" name="platform/system/connectivity/dhcp_client" />
   <project path="system/connectivity/shill" name="platform/system/connectivity/shill" />
-  <project path="system/core" name="platform/system/core" groups="pdk" />
+  <project path="system/core" name="platform/system/core" groups="pdk" remote="matombo" revision="refs/tags/android-7.1.2_r28_klist" />
   <project path="system/extras" name="platform/system/extras" groups="pdk" />
   <project path="system/firewalld" name="platform/system/firewalld" />
   <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" />