diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index 5aec851a5..11208018c 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,5 +1,5 @@
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=
+connection.project.dir=../xtext-umbrella.git/releng/gradle-composite
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 project.path=\:
diff --git a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs
index 78f048f6b..9d39da835 100644
--- a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs
index 6a418d2d8..cedc6682a 100644
--- a/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs
index c0b779ad6..947ba7ba1 100644
--- a/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs
index f5623944e..0cfe49fa5 100644
--- a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs
index 889ab9cdd..4c5fa8152 100644
--- a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs
index df3be6bcb..23c2091ae 100644
--- a/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs
index f7e708fb9..7bfa83a6b 100644
--- a/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs
index fae4dd7ed..4acae6ec2 100644
--- a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs
index ebe65234d..b538523d7 100644
--- a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
diff --git a/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs
index e2458baad..cc60ef38f 100644
--- a/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs
+++ b/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs
@@ -1,6 +1,7 @@
 build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=..
+connection.project.dir=../../xtext-umbrella.git/releng/gradle-composite
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature