diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b221efd393..8b644a44c5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -286,7 +286,6 @@ If `addOnlyProviding` is `true` repositories that don't provide any filtered uni
-
```
### Remove support for deployableFeature option
@@ -349,6 +348,32 @@ backports:
- api tools fixes
- new `tycho-eclipse-plugin`
+### OSGi Execution Environment Units are no longer published by default
+
+Previously Tycho has published so called 'Execution Environment Units' that represents the packages of the used Java version,
+but this has the drawback that these units represents the packages used during the build and not represent what is actually available at runtime.
+It could therefore happen that something is installed by P2 that later can't be resolved, especially since modular VMs can have any set of packages,
+additional packages are exposed by the framework and so on.
+
+Because of this there are some initiative to get rid of these generated units and let them be generated at runtime based on the actual VM present,
+if one requires previous behavior (e.g. to support older Eclipse / P2 / PDE / ...) it can be enabled as follows:
+
+```xml
+
+ org.eclipse.tycho
+ tycho-p2-publisher-plugin
+ ${tycho-version}
+
+
+ publish-osgi-ee
+
+ publish-osgi-ee
+
+
+
+
+```
+
## 4.0.4
Backports:
diff --git a/tycho-its/projects/eeProfile.java11/repository/pom.xml b/tycho-its/projects/eeProfile.java11/repository/pom.xml
index e86cf75637..e1caf60c27 100644
--- a/tycho-its/projects/eeProfile.java11/repository/pom.xml
+++ b/tycho-its/projects/eeProfile.java11/repository/pom.xml
@@ -10,6 +10,19 @@
eclipse-repository
+
+ org.eclipse.tycho
+ tycho-p2-publisher-plugin
+ ${tycho-version}
+
+
+ publish-osgi-ee
+
+ publish-osgi-ee
+
+
+
+
org.eclipse.tycho
tycho-p2-director-plugin
diff --git a/tycho-its/projects/eeProfile.java17/repository/pom.xml b/tycho-its/projects/eeProfile.java17/repository/pom.xml
index 43ced87063..a9cc48060b 100644
--- a/tycho-its/projects/eeProfile.java17/repository/pom.xml
+++ b/tycho-its/projects/eeProfile.java17/repository/pom.xml
@@ -18,6 +18,19 @@
JavaSE-17
+
+ org.eclipse.tycho
+ tycho-p2-publisher-plugin
+ ${tycho-version}
+
+
+ publish-osgi-ee
+
+ publish-osgi-ee
+
+
+
+
org.eclipse.tycho
tycho-p2-director-plugin
diff --git a/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index c8b238f511..e3ecf6585e 100644
--- a/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -187,7 +187,6 @@
org.apache.maven.plugins:maven-resources-plugin:${resources-plugin.version}:resources
- org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:publish-osgi-ee,
org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:publish-products,
org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:publish-categories,
org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:attach-artifacts,