diff --git a/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2 b/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2
index 931ed4795b3..bb6af6e66d5 100644
--- a/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2
+++ b/org.eclipse.xtext.builder.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2
@@ -32,8 +32,8 @@ Workflow {
 			grammarUri = "classpath:/org/eclipse/xtext/builder/tests/BuilderTestLanguage.xtext"
 			
 			fragment = ecore.EMFGeneratorFragment2 {
-				emfRuntimeVersion = "2.29"
-				jdkLevel = "JDK110"
+				emfRuntimeVersion = "2.36"
+				jdkLevel = "JDK170"
 			}
 			fragment = grammarAccess.GrammarAccessFragment2 {}
 			fragment = resourceFactory.ResourceFactoryFragment2 {}
diff --git a/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2 b/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2
index a3fa9e9a1f3..402a3241c93 100644
--- a/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2
+++ b/org.eclipse.xtext.common.types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2
@@ -12,7 +12,7 @@ import org.eclipse.xtext.xtext.generator.*
 
 CompositeGeneratorFragment2 {
 	fragment = ecore.EMFGeneratorFragment2 {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 	fragment = grammarAccess.GrammarAccessFragment2 {}
 	fragment = resourceFactory.ResourceFactoryFragment2 {}
diff --git a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
index 3fe6c8a710a..fe8d466f5fc 100644
--- a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
+++ b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
@@ -20,7 +20,7 @@ var backtrackLexer = false
 var debugGrammar = false
 var generateDebugData = false
 var generateStub = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {
diff --git a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
index 2d09959d29e..5999856d552 100644
--- a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
+++ b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
@@ -24,7 +24,7 @@ XtextGeneratorLanguage {
 
 	// generates Java API for the generated EPackages 
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 
 	// a custom ResourceFactory for use with EMF 
diff --git a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/nestedRefs/NestedRefsTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/nestedRefs/NestedRefsTestLanguage.mwe2
index 4b6a272c7c0..bbc4d6e95b1 100644
--- a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/nestedRefs/NestedRefsTestLanguage.mwe2
+++ b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/nestedRefs/NestedRefsTestLanguage.mwe2
@@ -14,7 +14,7 @@ XtextGeneratorLanguage {
 
 	// generates Java API for the generated EPackages
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 
 	// serializer 2.0
diff --git a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
index 4df9c0fcbf3..66370f49fc7 100644
--- a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
+++ b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
@@ -14,7 +14,7 @@ XtextGeneratorLanguage {
 
 	// generates Java API for the generated EPackages
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 
 	// serializer 2.0
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
index d170a3c20a3..82a6e7f0f67 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
@@ -20,7 +20,7 @@ var backtrackLexer = false
 var debugGrammar = false
 var generateDebugData = false
 var generateStub = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
index e97039f1377..a826dfea7e3 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
@@ -14,7 +14,7 @@ var genModel = ""
 var classSplitting = true
 var skipGenerate = false
 var backtrack = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {
diff --git a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragments.mwe2
index ea94398b174..c1dc1ccadc7 100644
--- a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragments.mwe2
+++ b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragments.mwe2
@@ -17,7 +17,7 @@ var classSplitting = true
 var skipGenerate = false
 var backtrack = false
 var memoize = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	
diff --git a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsBuilder.mwe2 b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsBuilder.mwe2
index a215c91b37a..22e47131063 100644
--- a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsBuilder.mwe2
+++ b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsBuilder.mwe2
@@ -15,7 +15,7 @@ var classSplitting = true
 var skipGenerate = false
 var backtrack = false
 var memoize = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = @org.eclipse.xtext.ui.tests.TestLanguagesFragments auto-inject {}
diff --git a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsWithConversionTimeout.mwe2 b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsWithConversionTimeout.mwe2
index 811a89904e3..7fe59f25e5a 100644
--- a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsWithConversionTimeout.mwe2
+++ b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsWithConversionTimeout.mwe2
@@ -17,7 +17,7 @@ var classSplitting = true
 var skipGenerate = false
 var backtrack = false
 var memoize = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {}
diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend
index 509203a1eab..1552b861a7a 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend
@@ -172,9 +172,9 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
 	@Accessors(PUBLIC_SETTER)
 	boolean suppressLoadInitialization = false
 
-	/* Default to 2.29 if available, otherwise #get will return null */
-	GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF229_VALUE)
-	GenJDKLevel jdkLevel = GenJDKLevel.JDK110_LITERAL
+	/* Default to 2.36 if available, otherwise #get will return null */
+	GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF236_VALUE)
+	GenJDKLevel jdkLevel = GenJDKLevel.JDK170_LITERAL
 	String rootExtendsClass = 'org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container'
 	
 	/**
@@ -198,7 +198,7 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
 	 *   <li>"JDK110"</li>
 	 *   <li>"JDK170"</li>
 	 * </ul>
-	 * The default level is "JDK110".
+	 * The default level is "JDK170".
 	 */
 	def void setJdkLevel(String jdkLevel) {
 		this.jdkLevel = GenJDKLevel.getByName(jdkLevel)
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java
index 248d37f02e7..9d8e8703aa3 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java
@@ -192,11 +192,11 @@ public class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
   private boolean suppressLoadInitialization = false;
 
   /**
-   * Default to 2.29 if available, otherwise #get will return null
+   * Default to 2.36 if available, otherwise #get will return null
    */
-  private GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF229_VALUE);
+  private GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF236_VALUE);
 
-  private GenJDKLevel jdkLevel = GenJDKLevel.JDK110_LITERAL;
+  private GenJDKLevel jdkLevel = GenJDKLevel.JDK170_LITERAL;
 
   private String rootExtendsClass = "org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container";
 
@@ -222,7 +222,7 @@ public void setEmfRuntimeVersion(final String emfRuntimeVersion) {
    *   <li>"JDK110"</li>
    *   <li>"JDK170"</li>
    * </ul>
-   * The default level is "JDK110".
+   * The default level is "JDK170".
    */
   public void setJdkLevel(final String jdkLevel) {
     this.jdkLevel = GenJDKLevel.getByName(jdkLevel);