diff --git a/.gitignore b/.gitignore
index c561386df8..5405f4a192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 *.xtendbin
 /*/xtend-gen/*
 !/*/xtend-gen/.gitignore
+.tycho-consumer-pom.xml
diff --git a/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch b/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
index ce35fe0ac2..61224ab98e 100644
--- a/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
+++ b/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
@@ -31,7 +31,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.check.ui.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch b/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch
index 2252b017bb..5988cb9a27 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch
@@ -31,7 +31,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.checkcfg.ui.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/com.avaloq.tools.ddk.sample.helloworld/.launch/Launch Runtime Eclipse.launch b/com.avaloq.tools.ddk.sample.helloworld/.launch/Launch Runtime Eclipse.launch
index 1a56ffc86f..e64dcfe17d 100644
--- a/com.avaloq.tools.ddk.sample.helloworld/.launch/Launch Runtime Eclipse.launch	
+++ b/com.avaloq.tools.ddk.sample.helloworld/.launch/Launch Runtime Eclipse.launch	
@@ -21,7 +21,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xms40m -Xmx512m"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/com.avaloq.tools.ddk.test.ui.test/AllTests.launch b/com.avaloq.tools.ddk.test.ui.test/AllTests.launch
index ee04f30bfe..adaf681412 100644
--- a/com.avaloq.tools.ddk.test.ui.test/AllTests.launch
+++ b/com.avaloq.tools.ddk.test.ui.test/AllTests.launch
@@ -31,7 +31,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.test.ui.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch b/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch
index c543ce3e8e..0cd665c69d 100644
--- a/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch	
+++ b/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch	
@@ -34,7 +34,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.xtext.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms256m&#13;&#10;-Xmx1536m&#13;&#10;-ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread&#13;&#10;-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms256m&#13;&#10;-Xmx1536m&#13;&#10;-ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch b/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
index 937ae68943..a2a3c0f819 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
+++ b/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
@@ -31,7 +31,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.xtext.ui.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.avaloq.test.sorter=alphanumeric&#13;&#10;-ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread&#13;&#10;-Dcom.avaloq.test.sorter=alphanumeric&#13;&#10;-ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/ddk-configuration/launches/devkit-run.launch b/ddk-configuration/launches/devkit-run.launch
index e48ba4d75d..461419bed6 100644
--- a/ddk-configuration/launches/devkit-run.launch
+++ b/ddk-configuration/launches/devkit-run.launch
@@ -20,7 +20,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog -clean -debug &quot;${workspace_loc:ddk-configuration/logging/debug.options}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms1g&#13;&#10;-Xmx3g"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread&#13;&#10;-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms1g&#13;&#10;-Xmx3g"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
 <setAttribute key="selected_target_bundles">
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index fcdc121434..e4d617beb5 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -373,6 +373,9 @@
                 <includes>
                   <include>**</include>
                 </includes>
+                <excludes>
+                  <exclude>.gitignore</exclude>
+                </excludes>
               </fileset>
             </filesets>
           </configuration>
@@ -396,30 +399,30 @@
     <profile>
       <activation>
         <os>
-          <name>sunos</name>
+          <name>linux</name>
+          <arch>amd64</arch>
           <family>unix</family>
         </os>
       </activation>
-      <id>solaris</id>
+      <id>64bit_linux</id>
       <properties>
-        <osgi.os>solaris</osgi.os>
+        <osgi.os>linux</osgi.os>
         <osgi.ws>gtk</osgi.ws>
-        <osgi.arch>x86</osgi.arch>
+        <osgi.arch>x86_64</osgi.arch>
       </properties>
     </profile>
     <profile>
+      <id>macosx</id>
       <activation>
         <os>
-          <name>linux</name>
-          <arch>amd64</arch>
-          <family>unix</family>
+          <family>mac</family>
         </os>
       </activation>
-      <id>64bit_linux</id>
       <properties>
-        <osgi.os>linux</osgi.os>
-        <osgi.ws>gtk</osgi.ws>
-        <osgi.arch>x86_64</osgi.arch>
+        <osgi.os>macosx</osgi.os>
+        <osgi.ws>cocoa</osgi.ws>
+        <osgi.arch>aarch64</osgi.arch>
+        <test.javaOptions>${runtime.javaOptions} -XstartOnFirstThread</test.javaOptions>
       </properties>
     </profile>
   </profiles>