diff --git a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
index 3d632b8f68..5583ca723e 100644
--- a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
+++ b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
@@ -75,14 +75,12 @@ public void generateFromEntityTest() throws Exception {
    * @throws Exception test fails
    */
   @Test
-  @Ignore // TODO: re-enable when upgrade process is implemented, see: https://github.com/devonfw/cobigen/issues/1595
   public void upgradeAndGenerateFromEntityTest() throws Exception {
 
-    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject"), this.tmpProject.toFile());
-    this.tmpProject.resolve("templates-devon4j").toFile()
-        .renameTo(this.tmpProject.resolve(ConfigurationConstants.COBIGEN_TEMPLATES).toFile());
+    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject/templates-devon4j"),
+        this.currentHome.toFile().toPath().resolve(ConfigurationConstants.COBIGEN_TEMPLATES).toFile());
     File baseProject = this.tmpProject.resolve("maven.project/core/").toFile();
-    File monolithicConfiguration = this.tmpProject.toFile();
+    File monolithicConfiguration = this.currentHome.toFile();
     String args[] = new String[7];
     args[0] = "generate";
     args[1] = this.entityInputFile.getAbsolutePath();
@@ -95,6 +93,7 @@ public void upgradeAndGenerateFromEntityTest() throws Exception {
     execute(args, false);
 
     assertThat(this.currentHome.resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_PATH)).exists();
+    assertThat(this.currentHome.resolve(ConfigurationConstants.BACKUP_FOLDER)).exists();
 
     assertThat(baseProject.toPath().resolve("src/main/java/com/maven/project/sampledatamanagement/logic/api/to"))
         .exists();
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java
index 7ce25f2ce5..4b775b7a84 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java
@@ -26,6 +26,8 @@
 import org.mockito.ArgumentMatchers;
 
 import com.devonfw.cobigen.api.CobiGen;
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.extension.GeneratorPluginActivator;
 import com.devonfw.cobigen.api.extension.InputReader;
@@ -37,6 +39,7 @@
 import com.devonfw.cobigen.api.to.MatcherTo;
 import com.devonfw.cobigen.api.to.TemplateTo;
 import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
 import com.devonfw.cobigen.impl.extension.PluginRegistry;
 import com.devonfw.cobigen.impl.model.ModelBuilderImpl;
 import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
@@ -81,6 +84,46 @@ public void testOverrideMergeStrategy() throws Exception {
     assertThat(target).hasContent("overwritten");
   }
 
+  /**
+   * Tests if after a upgrade with a merge of context and templates to template sets a generation of all matching (java)
+   * templates is successful
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testUpgradeAndGenerateWithJavaInput() throws Exception {
+
+    File templates = this.tmpFolder.newFolder("templates");
+    FileUtils.copyDirectory(new File(testFileRootPath + "UpgradeTest/templates"), templates);
+    CobiGen cobigen = null;
+    assertThatThrownBy(() -> {
+      CobiGenFactory.create(templates.toURI());
+    }).isInstanceOf(DeprecatedMonolithicConfigurationException.class);
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(templates.toPath());
+    Path templateSets = templateAdapter.upgradeMonolithicTemplates(templates.toPath());
+    cobigen = CobiGenFactory.create(templateSets.getParent().toUri());
+    Object input = cobigen.read(
+        new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java")
+            .toPath(),
+        Charset.forName("UTF-8"), getClass().getClassLoader());
+
+    File folder = this.tmpFolder.newFolder("GenerationTest");
+    File target = new File(folder, "generated.txt");
+    FileUtils.write(target, "base");
+
+    List<TemplateTo> templatesTos = cobigen.getMatchingTemplates(input);
+    List<IncrementTo> increments = cobigen.getMatchingIncrements(input);
+    List<String> triggersIds = cobigen.getMatchingTriggerIds(input);
+    assertThat(templatesTos).hasSize(1);
+    assertThat(increments).hasSize(1);
+    assertThat(triggersIds).hasSize(1);
+
+    GenerationReportTo report1 = cobigen.generate(input, templatesTos.get(0), Paths.get(folder.toURI()));
+
+    assertThat(report1).isSuccessful();
+  }
+
   /**
    * Tests that multiple template sets with templates, increments and triggers get read and generate of all matching
    * (java) templates is successful
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/pom.xml
new file mode 100644
index 0000000000..79e6e7b9c3
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>templates-devon4j</artifactId>
+  <version>dev-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math3</artifactId>
+      <version>3.6.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/templates</directory>
+        <targetPath>src/main/templates</targetPath>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Integrate POM manually</echo>
+                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/context.xml
new file mode 100644
index 0000000000..19358f4fee
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/context.xml
@@ -0,0 +1,6 @@
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+    <trigger id="entities" type="java" templateFolder="template-test">
+      <matcher type="fqn" value=".+">
+      </matcher>
+    </trigger>
+</contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates.xml
new file mode 100644
index 0000000000..d5b84d8bcd
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates.xml
@@ -0,0 +1,13 @@
+  <templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
+    <templates>
+      <template name="t2" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </templates>
+
+    <increments>
+      <increment name="i2" description="the only increment">
+        <templateRef ref="t2"/>
+      </increment>
+    </increments>
+  </templatesConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core/pom.xml b/cobigen/cobigen-core/pom.xml
index e97f0815a1..ee33c5fa93 100644
--- a/cobigen/cobigen-core/pom.xml
+++ b/cobigen/cobigen-core/pom.xml
@@ -148,7 +148,8 @@
               <packageName>com.devonfw.cobigen.impl.config.entity.io.v1_0</packageName>
               <outputDirectory>${project.build.directory}/generated-sources/config/v1.0</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v1.0</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/contextConfiguration.xsd</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/templatesConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>
@@ -237,16 +238,16 @@
             </configuration>
           </execution>
           <execution>
-            <id>generate-v6.0-configuration</id>
+            <id>generate-TSv1.0-configuration</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>xjc</goal>
             </goals>
             <configuration>
-              <packageName>com.devonfw.cobigen.impl.config.entity.io.v6_0</packageName>
-              <outputDirectory>${project.build.directory}/generated-sources/config/v6.0</outputDirectory>
+              <packageName>com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0</packageName>
+              <outputDirectory>${project.build.directory}/generated-sources/tsconfig/v1.0</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v6.0</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/templateSetConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>
@@ -261,7 +262,7 @@
               <packageName>com.devonfw.cobigen.impl.config.entity.io</packageName>
               <outputDirectory>${project.build.directory}/generated-sources/config/current</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v6.0/templateSetConfiguration.xsd</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/templateSetConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java
index c019ea0974..7bfe60e551 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java
@@ -84,7 +84,13 @@ private void readConfiguration(Path configRoot) throws InvalidConfigurationExcep
     }
 
     this.configurationPath = this.contextConfigurationReader.getContextRoot();
-    this.triggers = this.contextConfigurationReader.loadTriggers();
+    boolean isTemplateSet = false;
+    // check if configurationHolder is present to check for template set configuration
+    // configurationHolder is never used in monolitic configuration here.
+    if (this.configurationHolder != null) {
+      isTemplateSet = this.configurationHolder.isTemplateSetConfiguration();
+    }
+    this.triggers = this.contextConfigurationReader.loadTriggers(isTemplateSet);
 
   }
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java
index 156c363dcf..f80ea7782b 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java
@@ -60,8 +60,6 @@ public Map<String, Increment> getIncrements() {
   /** The reader to read the template-set.xml files */
   private TemplateSetConfigurationReader templateSetConfigurationReader;
 
-  private ConfigurationHolder configurationHolder;
-
   /**
    * Map of the root template folders distinguished by their trigger ID
    */
@@ -146,17 +144,17 @@ private void initializeTemplateSets(boolean isZipFile, Path configurationPath, P
     TemplateFolder templateFolder = this.templateSetConfigurationReader.getRootTemplateFolder();
 
     TemplatesConfigurationReader templatesConfigurationReader = new TemplatesConfigurationReader(
-        templatesConfigurationStatic, templateFolder, this.configurationHolder, templateSetFile);
+        templatesConfigurationStatic, templateFolder, null, templateSetFile);
 
     ContextConfigurationReader contextConfigurationReader = new ContextConfigurationReader(contextConfigurationStatic,
         templateSetFile);
 
-    Map<String, Trigger> trigger = contextConfigurationReader.loadTriggers();
+    Map<String, Trigger> trigger = contextConfigurationReader.loadTriggers(true);
 
     // uses the 1st element because a template-set has only one trigger
     Trigger activeTrigger = trigger.get(trigger.keySet().toArray()[0]);
 
-    Map<Path, Path> configLocations = this.templateSetConfigurationReader.getConfigLocations();
+      Map<Path, Path> configLocations = this.templateSetConfigurationReader.getConfigLocations();
     Path templateSetRootFolder = configLocations.get(templateSetFile);
     this.utilFolders.put(activeTrigger.getId(), templateSetRootFolder);
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java
index 03ee70a69a..58894dc7d4 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java
@@ -8,9 +8,10 @@
 public enum TemplateSetConfigurationVersion {
 
   /**
-   * Initial release. Merges the content of the context.xml and the templates.xml into a new template-set.xml file.
+   * Initial release. Merges the content of the context.xml v3 and the templates.xml v5 into a new template-set.xml
+   * file.
    */
-  v6_0(6f, false);
+  v1_0(1f, false);
 
   /** Comparable float representation of the version number. */
   private float floatRepresentation;
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
index 60b51f9321..7efadd8ae6 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
@@ -18,6 +18,7 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -319,17 +320,27 @@ private List<Path> loadContextFilesInSubfolder(Path configRoot) {
   /**
    * Loads all {@link Trigger}s of the static context into the local representation
    *
+   * @param isTemplateSet TODO
    * @return a {@link List} containing all the {@link Trigger}s
    */
-  public Map<String, Trigger> loadTriggers() {
+  public Map<String, Trigger> loadTriggers(boolean isTemplateSet) {
 
     Map<String, Trigger> triggers = new HashMap<>();
     for (Path contextFile : this.contextConfigurations.keySet()) {
       ContextConfiguration contextConfiguration = this.contextConfigurations.get(contextFile);
       for (com.devonfw.cobigen.impl.config.entity.io.Trigger t : contextConfiguration.getTrigger()) {
-        triggers.put(t.getId(), new Trigger(t.getId(), t.getType(), t.getTemplateFolder(),
+        String templateFolder = t.getTemplateFolder();
+        if (isTemplateSet) {
+          if (!StringUtils.isEmpty(templateFolder) || !templateFolder.equals("/")) {
+            LOG.warn("Ignoring content of template folder field: {} from trigger, not needed for template sets.",
+                templateFolder);
+          }
+          templateFolder = "/";
+        }
+        triggers.put(t.getId(), new Trigger(t.getId(), t.getType(), templateFolder,
             Charset.forName(t.getInputCharset()), loadMatchers(t), loadContainerMatchers(t)));
       }
+
     }
     return triggers;
   }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java
index ffc8390e8b..14c5c3341d 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java
@@ -750,7 +750,7 @@ private Trigger getExternalTrigger(String triggerToSearch) {
 
     ContextConfigurationReader contextConfigurationReader = new ContextConfigurationReader(
         this.configurationHolder.readContextConfiguration().getConfigurationPath());
-    Map<String, Trigger> triggers = contextConfigurationReader.loadTriggers();
+    Map<String, Trigger> triggers = contextConfigurationReader.loadTriggers(this.configurationHolder.isTemplateSetConfiguration());
     Trigger trig = triggers.get(triggerToSearch);
     if (trig == null) {
       throw new InvalidConfigurationException(this.configFilePath.toUri().toString(),
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java
index 3ceaf8f930..7c2c34c4c9 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java
@@ -27,12 +27,14 @@
 import org.xml.sax.SAXParseException;
 
 import com.devonfw.cobigen.api.constants.BackupPolicy;
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.exception.NotYetSupportedException;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.api.util.ExceptionUtil;
 import com.devonfw.cobigen.api.util.JvmUtil;
+import com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration;
 import com.devonfw.cobigen.impl.exceptions.BackupFailedException;
 import com.google.common.collect.Lists;
 
@@ -54,7 +56,7 @@
 public abstract class AbstractConfigurationUpgrader<VERSIONS_TYPE extends Enum<?>> {
 
   /** Logger instance. */
-  private static final Logger LOG = LoggerFactory.getLogger(AbstractConfigurationUpgrader.class);
+  protected static final Logger LOG = LoggerFactory.getLogger(AbstractConfigurationUpgrader.class);
 
   /** All enum values from the versions {@link Enum} */
   private VERSIONS_TYPE[] versions;
@@ -80,6 +82,11 @@ public abstract class AbstractConfigurationUpgrader<VERSIONS_TYPE extends Enum<?
    */
   private static final String JAXB_PACKAGE_PREFIX = "com.devonfw.cobigen.impl.config.entity.io";
 
+  /**
+   * Package prefix generated JAXB classes for the template set configurations (analogous to the pom.xml specification)
+   */
+  private static final String TS_JAXB_PACKAGE_PREFIX = "com.devonfw.cobigen.impl.tsconfig.entity.io";
+
   /**
    * Creates a new instance for the abstract implementation of an configuration upgrader.
    *
@@ -302,7 +309,7 @@ public boolean upgradeConfigurationToLatestVersion(Path templatesProject, Backup
       throw new InvalidConfigurationException(configurationFile.toUri().toString(),
           StringUtils.capitalize(this.configurationName) + " does not match any current or legacy schema definitions.");
     } else {
-      VERSIONS_TYPE latestVersion = versionsList.get(0);
+      VERSIONS_TYPE latestVersion = versionsList.get(versionsList.size() - 1);
       // increasing iteration of versions
       for (int i = 0; i < versionsList.size(); i++) {
         if (validatedVersion == latestVersion) {
@@ -327,9 +334,20 @@ public boolean upgradeConfigurationToLatestVersion(Path templatesProject, Backup
               try (OutputStream out = Files.newOutputStream(result.getConfigurationPath())) {
                 JAXB.marshal(result.getResultConfigurationJaxbRootNode(), out);
               }
-
-              // implicitly check upgrade step
-              VERSIONS_TYPE currentVersion = resolveLatestCompatibleSchemaVersion(result.getConfigurationPath());
+              VERSIONS_TYPE currentVersion;
+              if (result.getResultConfigurationJaxbRootNode().getClass()
+                  .equals(com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.TemplateSetConfiguration.class)) {
+                // changed class from context to templateSet, field has to be updated
+                this.configurationFilename = ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME;
+                this.configurationJaxbRootNode = TemplateSetConfiguration.class;
+                this.configurationName = "TemplateSet Configuration";
+                this.configurationXsdFilename = "templateSetConfiguration.xsd";
+                currentVersion = resolveLatestCompatibleSchemaVersion(result.getConfigurationPath(), true,
+                    versionsList.get(0)); // versionsList.get is a little hack to get v1 for template-set configurations
+              } else {
+                // implicitly check upgrade step
+                currentVersion = resolveLatestCompatibleSchemaVersion(result.getConfigurationPath());
+              }
               // if CobiGen does not understand the upgraded file... throw exception
               if (currentVersion == null) {
                 throw new CobiGenRuntimeException("An error occurred while upgrading " + this.configurationName
@@ -421,10 +439,11 @@ private void createBackup(Path file, BackupPolicy backupPolicy) {
    */
   private Class<?> getJaxbConfigurationClass(VERSIONS_TYPE lv) throws ClassNotFoundException {
 
-    Class<?> configurationClass = getClass().getClassLoader()
-        .loadClass(AbstractConfigurationUpgrader.JAXB_PACKAGE_PREFIX + "." + lv.name() + "."
-            + this.configurationJaxbRootNode.getSimpleName());
-    return configurationClass;
+    String prefix = this.configurationXsdFilename.equals("templateSetConfiguration.xsd")
+        ? AbstractConfigurationUpgrader.TS_JAXB_PACKAGE_PREFIX
+        : AbstractConfigurationUpgrader.JAXB_PACKAGE_PREFIX;
+    return getClass().getClassLoader()
+        .loadClass(prefix + "." + lv.name() + "." + this.configurationJaxbRootNode.getSimpleName());
   }
 
   /**
@@ -447,12 +466,21 @@ private Object unmarshallConfiguration(Path configurationFile, VERSIONS_TYPE lv,
     if (JvmUtil.isRunningJava9OrLater()) {
       Thread.currentThread().setContextClassLoader(JAXBContext.class.getClassLoader());
     }
-
+    StreamSource[] schemaArray;
+    System.out.println("Meine Version " + lv);
+    if (this.configurationXsdFilename.equals("templateSetConfiguration.xsd")) {
+      schemaArray = new StreamSource[] {
+      new StreamSource(getClass().getResourceAsStream("/schema/v5.0/templatesConfiguration.xsd")),
+      new StreamSource(getClass().getResourceAsStream("/schema/v3.0/contextConfiguration.xsd")), new StreamSource(
+          getClass().getResourceAsStream("/schema/" + lv.toString() + "/" + this.configurationXsdFilename)) };
+    } else {
+      schemaArray = new StreamSource[] { new StreamSource(
+          getClass().getResourceAsStream("/schema/" + lv.toString() + "/" + this.configurationXsdFilename)) };
+    }
     try {
       Unmarshaller unmarschaller = JAXBContext.newInstance(jaxbConfigurationClass).createUnmarshaller();
       SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-      Schema schema = schemaFactory.newSchema(new StreamSource(
-          getClass().getResourceAsStream("/schema/" + lv.toString() + "/" + this.configurationXsdFilename)));
+      Schema schema = schemaFactory.newSchema(schemaArray);
       unmarschaller.setSchema(schema);
       Object rootNode;
       try (InputStream in = Files.newInputStream(configurationFile)) {
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java
index 32c4e8b08c..aba8191ee8 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java
@@ -10,6 +10,7 @@
 import com.devonfw.cobigen.api.exception.NotYetSupportedException;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.impl.config.constant.ContextConfigurationVersion;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.TemplateSetConfiguration;
 
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.MapperFactory;
@@ -61,7 +62,6 @@ protected List<ConfigurationUpgradeResult> performNextUpgradeStep(ContextConfigu
         upgradedConfig_2_1 = mapper.map(previousConfigurationRootNode,
             com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration.class);
         upgradedConfig_2_1.setVersion(new BigDecimal("2.1"));
-
         result.setResultConfigurationJaxbRootNodeAndPath(upgradedConfig_2_1,
             configurationRoot.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME));
         results.add(result);
@@ -69,11 +69,12 @@ protected List<ConfigurationUpgradeResult> performNextUpgradeStep(ContextConfigu
         break;
       case v2_1:
         TemplateSetUpgrader templatesSetUpgrader = new TemplateSetUpgrader();
-        Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> contextMap = templatesSetUpgrader
-            .upgradeTemplatesToTemplateSets(templatesLocation);
-        for (com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration context : contextMap.keySet()) {
+        Map<TemplateSetConfiguration, Path> templateSetMap = templatesSetUpgrader
+            .upgradeTemplatesToTemplateSetsV6(templatesLocation);
+        for (TemplateSetConfiguration templateSetConfiguration : templateSetMap.keySet()) {
           ConfigurationUpgradeResult tempResult = new ConfigurationUpgradeResult();
-          tempResult.setResultConfigurationJaxbRootNodeAndPath(context, contextMap.get(context));
+          tempResult.setResultConfigurationJaxbRootNodeAndPath(templateSetConfiguration,
+              templateSetMap.get(templateSetConfiguration));
           results.add(tempResult);
         }
         break;
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java
index 78083353fa..cb84f9a8ba 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java
@@ -94,6 +94,10 @@ protected List<ConfigurationUpgradeResult> performNextUpgradeStep(TemplatesConfi
         results.add(result);
       }
         break;
+      case v5_0: { // to 5.0
+        // upgrade from v5 to v6 will be handles by context configuration upgrader cause of files merge
+      }
+        break;
       default:
         throw new NotYetSupportedException("An upgrade of the templates configuration from version " + source
             + " to a newer one is currently not supported.");
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetConfigurationUpgrader.java
new file mode 100644
index 0000000000..c0aad7d15b
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetConfigurationUpgrader.java
@@ -0,0 +1,45 @@
+package com.devonfw.cobigen.impl.config.upgrade;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.NotYetSupportedException;
+import com.devonfw.cobigen.impl.config.TemplateSetConfiguration;
+import com.devonfw.cobigen.impl.config.constant.TemplateSetConfigurationVersion;
+
+/**
+ * This class encompasses all logic for template-set configuration detection and upgrading these to the latest supported
+ * version.
+ */
+public class TemplateSetConfigurationUpgrader extends AbstractConfigurationUpgrader<TemplateSetConfigurationVersion> {
+
+  /**
+   * Creates a new {@link TemplateConfigurationUpgrader} instance.
+   *
+   */
+  public TemplateSetConfigurationUpgrader() {
+
+    super(TemplateSetConfigurationVersion.v1_0, TemplateSetConfiguration.class,
+        ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+  }
+
+  @Override
+  protected List<ConfigurationUpgradeResult> performNextUpgradeStep(TemplateSetConfigurationVersion source,
+      Object previousConfigurationRootNode, Path configurationRoot) throws Exception {
+
+    List<ConfigurationUpgradeResult> results = new ArrayList<>();
+    switch (source) {
+      case v1_0:
+        LOG.info("No Upgrade needed, v1 is the lastest version");
+        break;
+      default:
+        throw new NotYetSupportedException("This template set configuration version is not supported yet.");
+    }
+
+    return results;
+
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java
index 4216efa9e6..47334034ec 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java
@@ -24,11 +24,14 @@
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
-import com.devonfw.cobigen.impl.config.entity.io.Trigger;
-import com.devonfw.cobigen.impl.config.entity.io.v3_0.Link;
-import com.devonfw.cobigen.impl.config.entity.io.v3_0.Links;
-import com.devonfw.cobigen.impl.config.entity.io.v3_0.Tag;
-import com.devonfw.cobigen.impl.config.entity.io.v3_0.Tags;
+import com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration;
+import com.devonfw.cobigen.impl.config.entity.io.v2_1.Trigger;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Link;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Links;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Tag;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Tags;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.TemplateSetConfiguration;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.TemplatesConfiguration;
 
 import jakarta.xml.bind.JAXB;
 import jakarta.xml.bind.JAXBContext;
@@ -60,23 +63,16 @@ public TemplateSetUpgrader() {
 
     this.mapperFactory = new DefaultMapperFactory.Builder().useAutoMapping(true).mapNulls(true).build();
     this.mapperFactory
-        .classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class,
-            com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class)
-        .field(
-            "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}",
-            "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}")
-        .byDefault().register();
-    this.mapperFactory.classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger.class,
-        com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger.class).byDefault().register();
-    this.mapperFactory.classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher.class,
-        com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher.class).byDefault().register();
-    this.mapperFactory
-        .classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class,
-            com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class)
+        .classMap(com.devonfw.cobigen.impl.config.entity.io.v2_1.ContainerMatcher.class,
+            com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContainerMatcher.class)
         .field(
             "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}",
             "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}")
         .byDefault().register();
+    this.mapperFactory.classMap(com.devonfw.cobigen.impl.config.entity.io.v2_1.Trigger.class,
+        com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger.class).byDefault().register();
+    this.mapperFactory.classMap(com.devonfw.cobigen.impl.config.entity.io.v2_1.ContainerMatcher.class,
+        com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Matcher.class).byDefault().register();
     this.mapper = this.mapperFactory.getMapperFacade();
   }
 
@@ -84,15 +80,14 @@ public TemplateSetUpgrader() {
    * Upgrades the ContextConfiguration from v2.1 to the new structure from v3.0. The monolithic pom and context files
    * will be split into multiple files corresponding to every template set that will be created.
    *
-   * @param templatesLocation Path to the templates location
+   * @param templatesLocation {@link Path} to the templatesLocation
    *
    * @return {@link Map} collection that contains the upgraded v3.0
-   *         {@link com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration} as key and a {@link Path} for
+   *         {@link com.devonfw.cobigen.impl.config.entity.io.v6_0.ContextConfiguration} as key and a {@link Path} for
    *         the new location of the context.xml as value
    * @throws Exception if an issue occurred in directory copy operations
    */
-  public Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> upgradeTemplatesToTemplateSets(
-      Path templatesLocation) throws Exception {
+  public Map<TemplateSetConfiguration, Path> upgradeTemplatesToTemplateSetsV6(Path templatesLocation) throws Exception {
 
     Path cobigenTemplatesFolder = CobiGenPaths.getPomLocation(templatesLocation);
     Path parentOfCobigenTemplates = cobigenTemplatesFolder.getParent();
@@ -132,21 +127,22 @@ public Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration,
     com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration contextConfiguration = getContextConfiguration(
         folderOfContextLocation);
 
-    List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration> contextFiles = splitContext(
+    List<com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration> contextFiles = splitContext(
         contextConfiguration);
-    Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> contextMap = new HashMap<>();
-    for (com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration cc : contextFiles) {
-      for (com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger trigger : cc.getTrigger()) {
+    Map<TemplateSetConfiguration, Path> templateSetMap = new HashMap<>();
+    for (com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration cc : contextFiles) {
+      for (com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger trigger : cc.getTrigger()) {
         Path triggerFolder = folderOfContextLocation.resolve(trigger.getTemplateFolder());
         Path newTriggerFolder = adapted.resolve(trigger.getTemplateFolder());
         Path utilsPath = folderOfContextLocation.getParent().resolve("java");
         try {
           FileUtils.copyDirectory(triggerFolder.toFile(),
-              newTriggerFolder.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER).toFile());
+              newTriggerFolder.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER).toFile());
         } catch (Exception e) {
           LOG.error("An error occurred while copying the template Folder", e);
           throw new CobiGenRuntimeException(e.getMessage(), e);
         }
+
         try {
           if (Files.exists(utilsPath)) {
             FileUtils.copyDirectory(utilsPath.toFile(),
@@ -157,18 +153,27 @@ public Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration,
           throw new CobiGenRuntimeException(e.getMessage(), e);
         }
 
-        Path newContextPath = newTriggerFolder.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
-            .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
-        contextMap.put(cc, newContextPath);
-        // creates actual context configuration file
-        try (OutputStream out = Files.newOutputStream(newContextPath)) {
-          JAXB.marshal(cc, out);
+        // Read templates.xml then delete it
+        Path tcPath = newTriggerFolder.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER)
+            .resolve("templates.xml");
+        TemplatesConfiguration tc = readTemplatesConfiguration(tcPath);
+        Files.delete(tcPath);
+        // Use templates.xml and context.xml to generate template-set.xml
+        for (com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger t : cc.getTrigger()) {
+          t.setTemplateFolder("");
         }
+        TemplateSetConfiguration tsc = buildTemplateSetConfiguration(tc, cc);
+        Path tscPath = newTriggerFolder.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER)
+            .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+        try (OutputStream out = Files.newOutputStream(tscPath)) {
+          JAXB.marshal(tsc, out);
+        }
+        // Figure out template-set.xml path in new folder structure
+        tscPath = templateSets.resolve(folderToRename.toPath().relativize(newTriggerFolder)
+            .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER)
+            .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME));
+        templateSetMap.put(tsc, tscPath);
         writeNewPomFile(cobigenTemplatesFolder, newTriggerFolder, trigger);
-        newContextPath = templateSets.resolve(folderToRename.toPath().relativize(newTriggerFolder)
-            .resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
-            .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME));
-        contextMap.put(cc, newContextPath);
       }
     }
 
@@ -180,21 +185,20 @@ public Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration,
     }
     folderToRename.renameTo(templateSets.toFile());
 
-    return contextMap;
-
+    return templateSetMap;
   }
 
   /**
    * Writes a pom.xml file for the split context and template folder
    *
-   * @param cobigenTemplates Path to the CobiGen_Templates folder
-   * @param newTemplateFolder Path to the split template folder
-   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger} to the related template folder
-   * @throws IOException when an IOError occurred while reading the monolithic pom file
-   * @throws FileNotFoundException when a monolithic pom file could not be found
+   * @param cobigenTemplates {@link Path} to the CobiGen_Templates folder
+   * @param cobigenTemplates {@link Path} to the split template folder
+   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.v6_0.Trigger} to the related template folder
+   * @throws IOException
+   * @throws FileNotFoundException
    */
   private void writeNewPomFile(Path cobigenTemplates, Path newTemplateFolder,
-      com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger trigger) throws IOException, FileNotFoundException {
+      com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger trigger) throws IOException, FileNotFoundException {
 
     // Pom.xml creation
     try {
@@ -230,57 +234,78 @@ private void writeNewPomFile(Path cobigenTemplates, Path newTemplateFolder,
   }
 
   /**
-   * Splits a contextConfiguration and converts a {@link Trigger} and his data to a v3_0 Trigger
+   * Splits a contextConfiguration and converts a {@link Trigger} and his data to a v6_0 Trigger
    *
-   * @param ContextConfiguration {@link ContextConfiguration} of the monolithic context that will be split
-   * @return {@link com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration} List of the split
+   * @param monolithic {@link ContextConfiguration} of the monolithic context that will be split
+   * @return {@link com.devonfw.cobigen.impl.config.entity.io.v6_0.ContextConfiguration} List of the split
    *         contextConfiguration files
    */
-  private List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration> splitContext(
-      com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration monolithic) {
-
-    List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration> splitContexts = new ArrayList<>();
-    List<com.devonfw.cobigen.impl.config.entity.io.v2_1.Trigger> triggerList = monolithic.getTrigger();
-    for (com.devonfw.cobigen.impl.config.entity.io.v2_1.Trigger trigger : triggerList) {
-      com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration contextConfiguration3_0 = new com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration();
-      com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger trigger3_0 = new com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger();
-      trigger3_0.setId(trigger.getId());
-      trigger3_0.setInputCharset(trigger.getInputCharset());
-      trigger3_0.setType(trigger.getType());
-      trigger3_0.setTemplateFolder(trigger.getTemplateFolder());
-
-      List<com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher> v3MList = this.mapper.mapAsList(trigger.getMatcher(),
-          com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher.class);
-      List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher> v3CMList = this.mapper.mapAsList(
-          trigger.getContainerMatcher(), com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class);
-      trigger3_0.getContainerMatcher().addAll(v3CMList);
-      trigger3_0.getMatcher().addAll(v3MList);
-      contextConfiguration3_0.getTrigger().add(trigger3_0);
+  private List<com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration> splitContext(
+      ContextConfiguration monolithic) {
+
+    List<com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration> splitContexts = new ArrayList<>();
+    List<com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger> triggerList = this.mapper
+        .mapAsList(monolithic.getTrigger(), com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger.class);
+    for (com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.Trigger trigger : triggerList) {
+      com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration tscContextConfiguration = new com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration();
+      tscContextConfiguration.getTrigger().add(trigger);
       Tags tags = new Tags();
       Tag tag = new Tag();
       tag.setName(
           "PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER");
       tags.getTag().add(tag);
-      contextConfiguration3_0.setTags(tags);
+      tscContextConfiguration.setTags(tags);
       Links links = new Links();
       Link link = new Link();
       link.setUrl(
           "PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER");
       links.getLink().add(link);
-      contextConfiguration3_0.setLinks(links);
-      contextConfiguration3_0.setVersion(new BigDecimal("3.0"));
-      splitContexts.add(contextConfiguration3_0);
+      tscContextConfiguration.setLinks(links);
+      tscContextConfiguration.setVersion(new BigDecimal("3.0"));
+      splitContexts.add(tscContextConfiguration);
     }
     return splitContexts;
   }
 
+  private TemplateSetConfiguration buildTemplateSetConfiguration(TemplatesConfiguration tc,
+      com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.ContextConfiguration cc) {
+
+    TemplateSetConfiguration tsc = new TemplateSetConfiguration();
+    tsc.setVersion(new BigDecimal("1.0"));
+    tsc.setTemplatesConfiguration(tc);
+    tsc.setContextConfiguration(cc);
+    return tsc;
+  }
+
+  /**
+   * Reads templates.xml file
+   *
+   * @param templatesFile {@link Path} to the templates.xml file
+   * @return {@link TemplatesConfiguration} V6 templates configuration object
+   */
+  private TemplatesConfiguration readTemplatesConfiguration(Path templatesFile) throws IOException, JAXBException {
+
+    try (InputStream in = Files.newInputStream(templatesFile)) {
+      Unmarshaller um = JAXBContext.newInstance(TemplatesConfiguration.class).createUnmarshaller();
+
+      Object rootNode = um.unmarshal(in);
+      if (rootNode instanceof TemplatesConfiguration) {
+        TemplatesConfiguration tc = (TemplatesConfiguration) rootNode;
+        return tc;
+      }
+    } catch (IOException e) {
+      throw new InvalidConfigurationException("Templates file could not be found", e);
+    } catch (JAXBException e) {
+      throw new InvalidConfigurationException("Templates file provided some XML errors", e);
+    }
+    return null;
+  }
+
   /**
    * Locates and returns the correct context file
    *
-   * @param contextFile Path to the contextFile
-   * @return {@link com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration} of the context.xml file
-   * @throws FileNotFoundException if no context.xml could be found
-   * @throws InvalidConfigurationException if context file provided some XML errors
+   * @param contextFile {@link Path} to the contextFile
+   * @return {@link ContextConfiguration}
    */
   private com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration getContextConfiguration(Path contextFile)
       throws FileNotFoundException, InvalidConfigurationException {
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java
index 12a1e1801e..04ed7e44d2 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java
@@ -280,6 +280,8 @@ private ClassLoader prependTemplatesClassloader(ClassLoader inputProjectClassLoa
 
           if (Files.exists(pomFile)) {
             String pomFileHash = MavenUtil.generatePomFileHash(pomFile, MavenUtil.determineMavenRepositoryPath());
+            // gets classpath cache file within template-sets folder
+            cpCacheFile = configLocation.resolve(String.format(MavenConstants.CLASSPATH_CACHE_FILE, pomFileHash));
 
             // gets classpath cache file within template-sets folder
             cpCacheFile = configLocation.resolve(String.format(MavenConstants.CLASSPATH_CACHE_FILE, pomFileHash));
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v1.0/templateSetConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v1.0/templateSetConfiguration.xsd
new file mode 100644
index 0000000000..c56ea5765c
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/resources/schema/v1.0/templateSetConfiguration.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  targetNamespace="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" elementFormDefault="qualified" version="1.0">
+
+
+  <xs:import schemaLocation="../v3.0/contextConfiguration.xsd"
+    namespace="http://capgemini.com/devonfw/cobigen/ContextConfiguration"/>
+  <xs:import schemaLocation="../v5.0/templatesConfiguration.xsd"
+    namespace="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"/>
+
+  <xs:element name="templateSetConfiguration">
+    <xs:complexType>
+       <xs:all>
+        <xs:element ref="cc:contextConfiguration"/>
+        <xs:element ref="tc:templatesConfiguration"/>
+      </xs:all>
+      <xs:attribute name="version" use="required" type="xs:decimal"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java
index 5bd83d4d33..c1fa283c73 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java
@@ -19,7 +19,9 @@
 import com.devonfw.cobigen.api.constants.BackupPolicy;
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.impl.config.constant.ContextConfigurationVersion;
+import com.devonfw.cobigen.impl.config.constant.TemplateSetConfigurationVersion;
 import com.devonfw.cobigen.impl.config.upgrade.ContextConfigurationUpgrader;
+import com.devonfw.cobigen.impl.config.upgrade.TemplateSetConfigurationUpgrader;
 import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
 
 /**
@@ -80,23 +82,24 @@ public void testCorrectUpgrade_v2_0_TO_v_2_1() throws Exception {
   }
 
   /**
-   * Tests the valid upgrade of a context configuration from version v2.1 to v3.0. Please make sure that
-   * .../ContextConfigurationUpgraderTest/valid-v3.0 exists
+   * Tests the valid upgrade of a context configuration from version v2.1 to template set v1.This also includes a merge
+   * of a templateConfiguration v5.0 into a templateSetConfigration
    *
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectUpgrade_v2_1_TO_v3_0() throws Exception {
-
+  public void testCorrectUpgrade_v2_1_TO_TSv1_0() throws Exception {
 
     File cobigen = this.tempFolder.newFolder(ConfigurationConstants.COBIGEN_CONFIG_FILE);
 
     withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, cobigen.toPath().toString()).execute(() -> {
       // preparation
       ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_1;
-      ContextConfigurationVersion targetVersion = ContextConfigurationVersion.v3_0;
+      ContextConfigurationVersion latestVersion = ContextConfigurationVersion.v3_0;
+      TemplateSetConfigurationVersion targetVersion = TemplateSetConfigurationVersion.v1_0;
+
       String currentVersionPath = "valid-2.1";
-      String targetVersionPath = "valid-v3.0";
+      String targetVersionPathTS = "valid-v1.0";
 
       Path templates = cobigen.toPath().resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH)
           .resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
@@ -110,10 +113,7 @@ public void testCorrectUpgrade_v2_1_TO_v3_0() throws Exception {
       ContextConfigurationVersion version = sut.resolveLatestCompatibleSchemaVersion(context, currentVersion);
       assertThat(version).as("Source Version").isEqualTo(currentVersion);
 
-      sut.upgradeConfigurationToLatestVersion(templates, BackupPolicy.ENFORCE_BACKUP, targetVersion);
-      // copy resources again to check if backup was successful
-      String pom = "templates/CobiGen_Templates/pom.xml";
-      FileUtils.copyDirectory(new File(templateTestFileRootPath + File.separator + currentVersionPath), cobigen);
+      sut.upgradeConfigurationToLatestVersion(templates, BackupPolicy.ENFORCE_BACKUP, latestVersion);
 
       Path newTemplatesLocation = cobigen.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER)
           .resolve(ConfigurationConstants.ADAPTED_FOLDER);
@@ -122,17 +122,23 @@ public void testCorrectUpgrade_v2_1_TO_v3_0() throws Exception {
           .resolve(ConfigurationConstants.COBIGEN_TEMPLATES).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
           .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
 
-      for (String s : newTemplatesLocation.toFile().list()) {
-        Path newContextPath = newTemplatesLocation.resolve(s).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+      assertThat(backupContextPath).exists();
+      assertThat(templates).doesNotExist();
 
-        version = sut.resolveLatestCompatibleSchemaVersion(newContextPath, targetVersion);
-        assertThat(version).as("Target version").isEqualTo(targetVersion);
+      for (String templateName : newTemplatesLocation.toFile().list()) {
+        Path newContextPath = newTemplatesLocation.resolve(templateName)
+            .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
 
-        newContextPath = newContextPath.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+        TemplateSetConfigurationUpgrader tscU = new TemplateSetConfigurationUpgrader();
+        TemplateSetConfigurationVersion tscVersion = tscU.resolveLatestCompatibleSchemaVersion(newContextPath,
+            targetVersion);
+        assertThat(tscVersion).as("Target version").isEqualTo(targetVersion);
+
+        newContextPath = newContextPath.resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
         XMLUnit.setIgnoreWhitespace(true);
         try (
-            Reader firstReader = new FileReader(contextTestFileRootPath + File.separator + targetVersionPath
-                + File.separator + s + File.separator + ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+            Reader firstReader = new FileReader(contextTestFileRootPath + File.separator + targetVersionPathTS
+                + File.separator + templateName + File.separator + ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
             Reader secondReader = new FileReader(newContextPath.toFile())) {
           new XMLTestCase() {
           }.assertXMLEqual(firstReader, secondReader);
@@ -180,7 +186,7 @@ public void testCorrectV2_1SchemaDetection() throws Exception {
   }
 
   /**
-   * Tests if v3.0 context configuration is compatible to v3.0 schema.
+   * Tests if v6.0 context configuration is compatible to v6.0 schema.
    *
    * @throws Exception test fails
    */
@@ -189,24 +195,21 @@ public void testCorrectV3_0SchemaDetection() throws Exception {
 
     // preparation
     ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v3_0;
-    File targetConfig = new File(contextTestFileRootPath + "/valid-" + currentVersion);
+    File context = new File(contextTestFileRootPath + "/valid-" + currentVersion + "/context.xml");
 
-    for (File context : targetConfig.listFiles()) {
-      ContextConfigurationVersion version = new ContextConfigurationUpgrader()
-          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
-      assertThat(version).isEqualTo(currentVersion);
-    }
+    ContextConfigurationVersion version = new ContextConfigurationUpgrader()
+        .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+    assertThat(version).isEqualTo(currentVersion);
   }
 
   /**
-   * Tests if v3.0 context configuration schema is not compatible to v2.1 configuration file.
+   * Tests if v2.1 context configuration schema is not compatible to v6.0 configuration file.
    *
    * @throws Exception test fails
    */
   @Test
   public void testV2_1IsIncompatibleToV3_0Schema() throws Exception {
 
-
     // preparation
     ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_1;
     ContextConfigurationVersion targetVersion = ContextConfigurationVersion.v3_0;
@@ -218,4 +221,4 @@ public void testV2_1IsIncompatibleToV3_0Schema() throws Exception {
       assertThat(version).isNotEqualTo(targetVersion);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java
index 04a705cafc..6249731f04 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java
@@ -7,7 +7,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -34,6 +33,7 @@
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.impl.config.upgrade.ContextConfigurationUpgrader;
 import com.devonfw.cobigen.impl.config.upgrade.TemplateSetUpgrader;
+import com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0.TemplateSetConfiguration;
 import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
 
 /**
@@ -56,7 +56,6 @@ public class TemplateSetUpgraderTest extends AbstractUnitTest {
    * @throws Exception test fails
    */
   @Test
-  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
   public void testTemplateSetUpgrade() throws Exception {
 
     Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
@@ -67,7 +66,7 @@ public void testTemplateSetUpgrade() throws Exception {
 
     withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, currentHome.toString()).execute(() -> {
       TemplateSetUpgrader templateSetUpgrader = new TemplateSetUpgrader();
-      templateSetUpgrader.upgradeTemplatesToTemplateSets(templateLocation);
+      templateSetUpgrader.upgradeTemplatesToTemplateSetsV6(templateLocation);
 
       Path templateSetsPath = templateLocation.getParent().getParent()
           .resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
@@ -96,7 +95,7 @@ public void testTemplateSetUpgradeWithoutTemplatesFolder() throws Exception {
 
     withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, currentHome.toString()).execute(() -> {
       TemplateSetUpgrader templateSetUpgrader = new TemplateSetUpgrader();
-      templateSetUpgrader.upgradeTemplatesToTemplateSets(templateLocation);
+      templateSetUpgrader.upgradeTemplatesToTemplateSetsV6(templateLocation);
 
       Path templateSetsPath = templateLocation.getParent().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
       Path templateSetsAdapted = templateSetsPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
@@ -113,7 +112,6 @@ public void testTemplateSetUpgradeWithoutTemplatesFolder() throws Exception {
    * @throws Exception test fails
    */
   @Test
-  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
   public void testTemplateSetUpgradeCopyOfTemplates() throws Exception {
 
     Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
@@ -129,8 +127,8 @@ public void testTemplateSetUpgradeCopyOfTemplates() throws Exception {
           .map(Path::getFileName).collect(Collectors.toList());
 
       TemplateSetUpgrader templateSetUpgrader = new TemplateSetUpgrader();
-      Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> newContextConfigurations = templateSetUpgrader
-          .upgradeTemplatesToTemplateSets(templateLocation);
+      Map<TemplateSetConfiguration, Path> templateSetConfigurations = templateSetUpgrader
+          .upgradeTemplatesToTemplateSetsV6(templateLocation);
 
       Path newTemplatesPath = templateLocation.getParent().getParent()
           .resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER).resolve(ConfigurationConstants.ADAPTED_FOLDER);
@@ -138,10 +136,10 @@ public void testTemplateSetUpgradeCopyOfTemplates() throws Exception {
 
       assertEquals(OldTemplatesFileCount - 1, NewPathFilesSet.size());
 
-      for (Path contextpath : newContextConfigurations.values()) {
-        assertThat(contextpath).exists();
+      for (Path templateSetPath : templateSetConfigurations.values()) {
+        assertThat(templateSetPath).exists();
 
-        validateContextConfigurationFile(contextpath, "v3.0");
+        validateTemplateSetConfiguration(templateSetPath, "v6.0");
 
       }
       List<Path> backupFolderFiles = Files.walk(
@@ -161,30 +159,24 @@ public void testTemplateSetUpgradeCopyOfTemplates() throws Exception {
   /**
    * Validates a context configuration file with given xsd schema version and fails the test if the validation failed.
    *
-   * @param contextpath Path to context configuration file.
+   * @param templateSetPath Path to context configuration file.
    * @param schemaVersion String version to validate against f.e. : v2.2.
    * @throws SAXException if a fatal error is found.
    * @throws IOException if the underlying reader throws an IOException.
    */
-  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
-  private void validateContextConfigurationFile(Path contextpath, String schemaVersion)
+  private void validateTemplateSetConfiguration(Path templateSetPath, String schemaVersion)
       throws SAXException, IOException {
 
     SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-    try (InputStream schemaStream = getClass()
-        .getResourceAsStream("/schema/" + schemaVersion + "/contextConfiguration.xsd")) {
-      StreamSource schemaSourceStream = new StreamSource(schemaStream);
-      Schema schema = schemaFactory.newSchema(schemaSourceStream);
-      Validator validator = schema.newValidator();
-      StreamSource contextStream = new StreamSource(contextpath.toFile());
-      try {
-        validator.validate(contextStream);
-      } catch (SAXException e) {
-        fail("Exception shows that validator has found an error with the context configuration file \n" + e);
-        contextStream.getInputStream().close();
-        schemaStream.close();
-      }
-      schemaStream.close();
+    Schema schema = schemaFactory
+        .newSchema(getClass().getResource("/schema/" + schemaVersion + "/templateSetConfiguration.xsd"));
+    Validator validator = schema.newValidator();
+    StreamSource contextStream = new StreamSource(templateSetPath.toFile());
+    try {
+      validator.validate(contextStream);
+    } catch (SAXException e) {
+      fail("Exception shows that validator has found an error with the template-set configuration file \n" + e);
+      contextStream.getInputStream().close();
     }
 
   }
@@ -196,7 +188,7 @@ private void validateContextConfigurationFile(Path contextpath, String schemaVer
    * @throws Exception test fails
    */
   @Test
-  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
+  @Ignore
   public void testTemplateSetUpgradeContextSplit() throws Exception {
 
     Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
@@ -214,11 +206,11 @@ public void testTemplateSetUpgradeContextSplit() throws Exception {
       newTemplatesPath = newTemplatesPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
 
       for (String s : newTemplatesPath.toFile().list()) {
-        Path newContextPath = newTemplatesPath.resolve(s).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
-        newContextPath = newContextPath.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
-        assertThat(newContextPath.toFile()).exists();
+        Path templateSetPath = newTemplatesPath.resolve(s).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+        templateSetPath = templateSetPath.resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+        assertThat(templateSetPath.toFile()).exists();
 
-        validateContextConfigurationFile(newContextPath, "v3.0");
+        validateTemplateSetConfiguration(templateSetPath, "v6.0");
       }
     });
   }
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v1.0/templateSet1/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v1.0/templateSet1/template-set.xml
new file mode 100644
index 0000000000..c5b088fedf
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v1.0/templateSet1/template-set.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns3:templateSetConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:ns2="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:ns3="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" version="1.0">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
+	<trigger id="templateSet1" type="java" templateFolder="" inputCharset="UTF-8">
+		<containerMatcher type="package" value="someValue" retrieveObjectsRecursively="false" />
+		<matcher type="fqn" value="*" accumulationType="NOT">
+			<variableAssignment type="constant" key="foo" value="BLUBB1" />
+		</matcher>
+	</trigger>
+	<tags>
+		<tag name="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</tags>
+	<links>
+		<link url="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</links>
+</contextConfiguration>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="4.0">
+    <templates>
+        <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_fillMandatoryFields" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+        <template name="entityBuilder_persistable" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </templates>
+    <increments>
+        <increment name="testdata_builder" description="Testdata builder">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+        </increment>
+        <increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+            <templateRef ref="entityBuilder_persistable"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
+</ns3:templateSetConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v1.0/templateSet2/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v1.0/templateSet2/template-set.xml
new file mode 100644
index 0000000000..2c25b21648
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v1.0/templateSet2/template-set.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns3:templateSetConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:ns2="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:ns3="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" version="1.0">
+<contextConfiguration version="3.0">
+  <trigger id="templateSet2" type="someType" templateFolder="" inputCharset="UTF-8">
+    <containerMatcher type="element" value="someValue" retrieveObjectsRecursively="true"/>
+    <matcher type="element" value="*" accumulationType="OR">
+      <variableAssignment type="constant" key="foo" value="BlABLA1"/>
+    </matcher>
+  </trigger>
+  	<tags>
+		<tag name="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</tags>
+	<links>
+		<link url="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</links>
+</contextConfiguration>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="5.0">
+    <templates>
+        <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_fillMandatoryFields" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+        <template name="entityBuilder_persistable" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </templates>
+    <increments>
+        <increment name="testdata_builder" description="Testdata builder">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+        </increment>
+        <increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+            <templateRef ref="entityBuilder_persistable"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
+</ns3:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/context.xml
new file mode 100644
index 0000000000..c045a37afd
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/context.xml
@@ -0,0 +1,14 @@
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="6.0">
+  <trigger id="templateSet1" type="java" templateFolder="templateSet1" inputCharset="UTF-8">
+    <containerMatcher type="package" value="someValue" retrieveObjectsRecursively="false" />
+    <matcher type="fqn" value="*" accumulationType="NOT">
+      <variableAssignment type="constant" key="foo" value="BLUBB1" />
+    </matcher>
+  </trigger>
+  <tags>
+    <tag name="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+  </tags>
+  <links>
+    <link url="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+  </links>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
index 58faf11db1..78c78650d9 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="4.0">
     <templates>
         <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
         <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder.java.ftl
new file mode 100644
index 0000000000..fc8f58c822
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder.java.ftl
@@ -0,0 +1,51 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+    private List<Consumer<${pojo.name}>> parameterToBeApplied;
+
+  /**
+   * The constructor.
+   */
+    public ${pojo.name}Builder() {
+    this.parameterToBeApplied = new LinkedList<>();
+    fillMandatoryFields();
+    fillMandatoryFields_custom();
+  }
+
+    <#list pojo.methodAccessibleFields as field>
+    <#if field.name != "id" && field.name != "modificationCounter">
+  /**
+   * @param ${field.name} the ${field.name} to add.
+   * @return the builder for fluent population of fields.
+   */
+  public ${pojo.name}Builder ${field.name}(final ${field.type} ${field.name}) {
+        this.parameterToBeApplied.add(target -> target.set${field.name?cap_first}(${field.name}));
+
+        return this;
+    }
+    </#if>
+    </#list>
+
+  /**
+   * @return the populated ${pojo.name}.
+   */
+    public ${pojo.name} createNew() {
+        ${pojo.name} ${pojo.name?lower_case} = new ${pojo.name}();
+        for (Consumer<${pojo.name}> parameter : parameterToBeApplied) {
+            parameter.accept(${pojo.name?lower_case});
+        }
+        return ${pojo.name?lower_case};
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_customFunctions.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_customFunctions.java.ftl
new file mode 100644
index 0000000000..e97598610d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_customFunctions.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Might be enriched to users needs (will not be overwritten)
+	 */	
+    private void fillMandatoryFields_custom() {
+    
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_fillMandatoryFields.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_fillMandatoryFields.java.ftl
new file mode 100644
index 0000000000..2e82fa9cd0
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_fillMandatoryFields.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Fills all mandatory fields by default. (will be overwritten on re-generation)
+	 */
+    private void fillMandatoryFields() {
+	    <#list pojo.methodAccessibleFields as attr>		
+		<#if (attr.annotations.javax_validation_constraints_NotNull)?has_content
+		  || ((attr.annotations.javax_persistence_Column.nullable)?has_content
+		   && attr.annotations.javax_persistence_Column.nullable == "false")>
+		<@callNotNullPropertyWithDefaultValue attr=attr/>	
+		</#if>
+	    </#list>
+    }
+    
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_persistable.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_persistable.java.ftl
new file mode 100644
index 0000000000..9c0e2c4f42
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/ObjectBuilder_persistable.java.ftl
@@ -0,0 +1,45 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.persistence.EntityManager;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+  /**
+   * @param em the {@link EntityManager}
+   * @return the ${pojo.name}
+   */
+   public ${pojo.name} persist(EntityManager em) {
+        ${pojo.name} ${pojo.name?lower_case} = createNew();
+        em.persist(${pojo.name?lower_case});
+        return ${pojo.name?lower_case};
+    }
+    
+  /**
+   * @param em the {@link EntityManager}
+   * @param quantity the quantity
+   * @return a list of ${pojo.name}
+   */
+    public List<${pojo.name}> persistAndDuplicate(EntityManager em, int quantity) {
+
+        List<${pojo.name}> ${pojo.name?lower_case}List = new LinkedList<>();
+        for (int i = 0; i < quantity; i++) {
+            ${pojo.name} ${pojo.name?lower_case} = createNew();
+            // TODO alter at least values with unique key constraints to prevent from exceptions while persisting
+            em.persist(${pojo.name?lower_case});
+            ${pojo.name?lower_case}List.add(${pojo.name?lower_case});
+        }
+
+        return ${pojo.name?lower_case}List;
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/makros.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/makros.ftl
new file mode 100644
index 0000000000..1d40c4d681
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates/makros.ftl
@@ -0,0 +1,53 @@
+<#macro callNotNullPropertyWithDefaultValue attr>
+<#if attr.canonicalType = "byte" || attr.canonicalType = "java.lang.Byte" >
+	${attr.name}((byte)1);
+<#elseif attr.canonicalType  = "short" || attr.canonicalType = "java.lang.Short" >
+	${attr.name}((short)1);
+<#elseif attr.canonicalType  = "int" || attr.canonicalType = "java.lang.Integer" >
+	${attr.name}(1);
+<#elseif attr.canonicalType  = "long" || attr.canonicalType = "java.lang.Long" >
+	${attr.name}(1L);
+<#elseif attr.canonicalType  = "float" || attr.canonicalType = "java.lang.Float" >
+	${attr.name}(1f);
+<#elseif attr.canonicalType  = "double" || attr.canonicalType = "java.lang.Double" >
+	${attr.name}(1d);
+<#elseif attr.canonicalType  = "char" || attr.canonicalType = "java.lang.Character" >
+	${attr.name}('c');
+<#elseif attr.canonicalType  = "boolean" || attr.canonicalType = "java.lang.Boolean" >
+	${attr.name}(true);
+<#elseif attr.canonicalType   = "java.lang.String">
+	${attr.name}("DefaultString");
+<#elseif attr.canonicalType   = "java.lang.Number">
+	${attr.name}(1);
+<#elseif attr.canonicalType   = "java.util.Currency">
+  ${attr.name}(Currency.getInstance("USD"));
+<#elseif attr.canonicalType   = "java.math.BigDecimal">
+  ${attr.name}(BigDecimal.valueOf(1.0));
+<#elseif attr.canonicalType   = "java.time.LocalTime">
+  ${attr.name}(LocalTime.now());
+<#elseif attr.canonicalType   = "java.time.LocalDate">
+  ${attr.name}(LocalDate.now());
+<#elseif attr.canonicalType   = "java.time.LocalDateTime">
+  ${attr.name}(LocalDateTime.now());
+<#elseif attr.canonicalType   = "java.time.ZonedDateTime">
+  ${attr.name}(ZonedDateTime.now());
+<#elseif JavaUtil.isEnum(attr.canonicalType)>
+  ${attr.name}(${attr.type}.${JavaUtil.getFirstEnumValue(attr.canonicalType)});
+<#elseif attr.canonicalType?ends_with("[]")>
+  ${attr.name}(new ${attr.type?keep_before_last("[]")}[0]);
+<#elseif getPackage(attr.canonicalType) = pojo.package>
+	${attr.name}(new ${attr.name?cap_first}Builder().createNew());
+<#else>
+	//TODO ${attr.name}(...); //set Default ${attr.canonicalType}
+</#if>
+</#macro>
+
+<#function getPackage fqn>
+	<#assign lastIndexOfDot=fqn?last_index_of(".")+1 />
+	<#assign package = fqn?substring(0, lastIndexOfDot) />
+	<#if package = "">
+		<#-- Heuristic, which might cause faulty generation results in some not often occuring cases -->
+		<#assign package = pojo.package>
+	</#if>
+	<#return package>
+</#function>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
index 58faf11db1..eef688efa6 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="5.0">
     <templates>
         <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
         <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v6.0/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v6.0/templates.xml
new file mode 100644
index 0000000000..c7cf9479a6
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v6.0/templates.xml
@@ -0,0 +1,21 @@
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="6.0">
+    <templates>
+        <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_fillMandatoryFields" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+        <template name="entityBuilder_persistable" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </templates>
+    <increments>
+        <increment name="testdata_builder" description="Testdata builder">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+        </increment>
+        <increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+            <templateRef ref="entityBuilder_persistable"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
\ No newline at end of file