diff --git a/features/org.jboss.tools.openshift.cdk.feature/feature.xml b/features/org.jboss.tools.openshift.cdk.feature/feature.xml
index 33c8e8ae1..2dcbc4c97 100755
--- a/features/org.jboss.tools.openshift.cdk.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.cdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.cdk.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.cdk.server"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/features/org.jboss.tools.openshift.cdk.feature/pom.xml b/features/org.jboss.tools.openshift.cdk.feature/pom.xml
index 30d95a775..f9ee979ed 100644
--- a/features/org.jboss.tools.openshift.cdk.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.cdk.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.feature</artifactId> 
diff --git a/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml b/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml
index 95c8b874a..092c61f6b 100644
--- a/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.cdk.test.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
diff --git a/features/org.jboss.tools.openshift.cdk.test.feature/pom.xml b/features/org.jboss.tools.openshift.cdk.test.feature/pom.xml
index e26a7160d..178505a57 100644
--- a/features/org.jboss.tools.openshift.cdk.test.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.cdk.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.test.feature</artifactId> 
diff --git a/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml b/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
index 8675c1157..8bc46f377 100644
--- a/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.egit.integration.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.egit.integration.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.egit.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml b/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
index 716815ce3..1a318b9ff 100644
--- a/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.egit.integration.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.integration.feature</artifactId> 
diff --git a/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml b/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
index f073856c1..bc9595252 100644
--- a/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.egit.integration.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.egit.integration.test.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
 	  license-feature-version="0.0.0">
diff --git a/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml b/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
index 0a7a99391..44c7bdb11 100644
--- a/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.egit.integration.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.integration.test.feature</artifactId>
diff --git a/features/org.jboss.tools.openshift.feature/feature.xml b/features/org.jboss.tools.openshift.feature/feature.xml
index 618da30b1..0d5f2e3d6 100755
--- a/features/org.jboss.tools.openshift.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/features/org.jboss.tools.openshift.feature/pom.xml b/features/org.jboss.tools.openshift.feature/pom.xml
index 1a661b415..10ab52e19 100644
--- a/features/org.jboss.tools.openshift.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.feature</artifactId> 
diff --git a/features/org.jboss.tools.openshift.js.feature/feature.xml b/features/org.jboss.tools.openshift.js.feature/feature.xml
index e7b96f9bb..32c34d377 100644
--- a/features/org.jboss.tools.openshift.js.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.js.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.js.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.openshift.js"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/features/org.jboss.tools.openshift.js.feature/pom.xml b/features/org.jboss.tools.openshift.js.feature/pom.xml
index a51752831..3d902649f 100644
--- a/features/org.jboss.tools.openshift.js.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.js.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.js.feature</artifactId>
diff --git a/features/org.jboss.tools.openshift.test.feature/feature.xml b/features/org.jboss.tools.openshift.test.feature/feature.xml
index 1bae612d4..1b6c72833 100644
--- a/features/org.jboss.tools.openshift.test.feature/feature.xml
+++ b/features/org.jboss.tools.openshift.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.openshift.test.feature"
       label="%featureName"
-      version="3.24.0.qualifier"
+      version="3.24.100.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
diff --git a/features/org.jboss.tools.openshift.test.feature/pom.xml b/features/org.jboss.tools.openshift.test.feature/pom.xml
index 89287b1c0..56fcedc9f 100644
--- a/features/org.jboss.tools.openshift.test.feature/pom.xml
+++ b/features/org.jboss.tools.openshift.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>features</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.features</groupId>
 	<artifactId>org.jboss.tools.openshift.test.feature</artifactId> 
diff --git a/features/pom.xml b/features/pom.xml
index 445c4f331..039e12d57 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>features</artifactId>
diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml
index 4b154da9f..ee037e033 100644
--- a/jacoco-report/pom.xml
+++ b/jacoco-report/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>jacoco-report</artifactId>
@@ -37,65 +37,65 @@
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.egit.core</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.egit.ui</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.client</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.common.core</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.common.ui</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.core</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.ui</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.cdk.server</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.plugins</groupId>
             <artifactId>org.jboss.tools.openshift.js</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
         </dependency>
         <!-- tests -->
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.egit.test</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.test</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.tools.openshift.tests</groupId>
             <artifactId>org.jboss.tools.openshift.cdk.server.test</artifactId>
-            <version>3.24.0-SNAPSHOT</version>
+            <version>3.24.100-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugins/org.jboss.tools.openshift.cdk.server/.classpath b/plugins/org.jboss.tools.openshift.cdk.server/.classpath
index cf36b5611..7931ec26b 100644
--- a/plugins/org.jboss.tools.openshift.cdk.server/.classpath
+++ b/plugins/org.jboss.tools.openshift.cdk.server/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF
index c665eb0d8..4bcbade48 100644
--- a/plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.cdk.server/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.cdk.server;singleton:=true
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.jboss.tools.openshift.internal.cdk.server.core.CDKCoreActivator
 Require-Bundle: org.jboss.tools.usage;bundle-version="2.1.0",
diff --git a/plugins/org.jboss.tools.openshift.cdk.server/pom.xml b/plugins/org.jboss.tools.openshift.cdk.server/pom.xml
index 9d1fa4f9d..efbe45ce7 100644
--- a/plugins/org.jboss.tools.openshift.cdk.server/pom.xml
+++ b/plugins/org.jboss.tools.openshift.cdk.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.server</artifactId> 
diff --git a/plugins/org.jboss.tools.openshift.client/.classpath b/plugins/org.jboss.tools.openshift.client/.classpath
index 58a9434b4..37f9c797a 100644
--- a/plugins/org.jboss.tools.openshift.client/.classpath
+++ b/plugins/org.jboss.tools.openshift.client/.classpath
@@ -6,7 +6,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/openshift-restclient-java-9.0.5.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/okhttp-4.10.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/logging-interceptor-4.10.0.jar"/>
diff --git a/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF
index a113757cd..4556b2804 100644
--- a/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.client;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/plugins/org.jboss.tools.openshift.client/pom.xml b/plugins/org.jboss.tools.openshift.client/pom.xml
index 4f7641889..d89247517 100644
--- a/plugins/org.jboss.tools.openshift.client/pom.xml
+++ b/plugins/org.jboss.tools.openshift.client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.client</artifactId>
diff --git a/plugins/org.jboss.tools.openshift.common.core/.classpath b/plugins/org.jboss.tools.openshift.common.core/.classpath
index e801ebfb4..5050774b8 100644
--- a/plugins/org.jboss.tools.openshift.common.core/.classpath
+++ b/plugins/org.jboss.tools.openshift.common.core/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF
index 361ae6c2b..467ff6ec2 100644
--- a/plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.common.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.common.core
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.internal.common.core.OpenShiftCommonCoreActivator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/org.jboss.tools.openshift.common.core/pom.xml b/plugins/org.jboss.tools.openshift.common.core/pom.xml
index 5d9b316eb..c95b6e965 100644
--- a/plugins/org.jboss.tools.openshift.common.core/pom.xml
+++ b/plugins/org.jboss.tools.openshift.common.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.common.core</artifactId> 
diff --git a/plugins/org.jboss.tools.openshift.common.ui/.classpath b/plugins/org.jboss.tools.openshift.common.ui/.classpath
index cf36b5611..5050774b8 100644
--- a/plugins/org.jboss.tools.openshift.common.ui/.classpath
+++ b/plugins/org.jboss.tools.openshift.common.ui/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.common.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.common.ui/META-INF/MANIFEST.MF
index 18329ab71..d7abe0384 100644
--- a/plugins/org.jboss.tools.openshift.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.common.ui;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIActivator
 Require-Bundle: org.jboss.tools.openshift.common.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/org.jboss.tools.openshift.common.ui/pom.xml b/plugins/org.jboss.tools.openshift.common.ui/pom.xml
index 6caa7b26b..17415efb3 100644
--- a/plugins/org.jboss.tools.openshift.common.ui/pom.xml
+++ b/plugins/org.jboss.tools.openshift.common.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.common.ui</artifactId> 
diff --git a/plugins/org.jboss.tools.openshift.core/.classpath b/plugins/org.jboss.tools.openshift.core/.classpath
index a62abcc1f..e7cfe8354 100644
--- a/plugins/org.jboss.tools.openshift.core/.classpath
+++ b/plugins/org.jboss.tools.openshift.core/.classpath
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="resources/"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="resources">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.core/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.core/META-INF/MANIFEST.MF
index 11a86a758..77a818fd8 100644
--- a/plugins/org.jboss.tools.openshift.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.core;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.internal.core.OpenShiftCoreActivator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/plugins/org.jboss.tools.openshift.core/pom.xml b/plugins/org.jboss.tools.openshift.core/pom.xml
index 2f86a8499..c9dfa7c94 100644
--- a/plugins/org.jboss.tools.openshift.core/pom.xml
+++ b/plugins/org.jboss.tools.openshift.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.core</artifactId> 
diff --git a/plugins/org.jboss.tools.openshift.egit.core/.classpath b/plugins/org.jboss.tools.openshift.egit.core/.classpath
index cf36b5611..5050774b8 100644
--- a/plugins/org.jboss.tools.openshift.egit.core/.classpath
+++ b/plugins/org.jboss.tools.openshift.egit.core/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
index a26d37dc2..1fe3c5119 100644
--- a/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.egit.core;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.internal.egit.core.EGitCoreActivator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.jgit;bundle-version="3.0.0";visibility:=reexport,
diff --git a/plugins/org.jboss.tools.openshift.egit.core/pom.xml b/plugins/org.jboss.tools.openshift.egit.core/pom.xml
index df004cba7..ba5419f90 100644
--- a/plugins/org.jboss.tools.openshift.egit.core/pom.xml
+++ b/plugins/org.jboss.tools.openshift.egit.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.core</artifactId> 
diff --git a/plugins/org.jboss.tools.openshift.egit.ui/.classpath b/plugins/org.jboss.tools.openshift.egit.ui/.classpath
index eca7bdba8..5050774b8 100644
--- a/plugins/org.jboss.tools.openshift.egit.ui/.classpath
+++ b/plugins/org.jboss.tools.openshift.egit.ui/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
index 36640c34b..325501359 100644
--- a/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.jboss.tools.openshift.egit.ui;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.egit.ui.EGitUIActivator
 Bundle-Localization: plugin
 Require-Bundle: org.jboss.tools.openshift.egit.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/org.jboss.tools.openshift.egit.ui/pom.xml b/plugins/org.jboss.tools.openshift.egit.ui/pom.xml
index b01c4fec2..c1be0a6ff 100644
--- a/plugins/org.jboss.tools.openshift.egit.ui/pom.xml
+++ b/plugins/org.jboss.tools.openshift.egit.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.ui</artifactId> 
diff --git a/plugins/org.jboss.tools.openshift.js/.classpath b/plugins/org.jboss.tools.openshift.js/.classpath
index eca7bdba8..5050774b8 100644
--- a/plugins/org.jboss.tools.openshift.js/.classpath
+++ b/plugins/org.jboss.tools.openshift.js/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.js/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.js/META-INF/MANIFEST.MF
index c93af0718..5f238e442 100644
--- a/plugins/org.jboss.tools.openshift.js/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.js/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.js;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.jdt.core,
diff --git a/plugins/org.jboss.tools.openshift.js/pom.xml b/plugins/org.jboss.tools.openshift.js/pom.xml
index 4de9b4ea1..ffe96972e 100644
--- a/plugins/org.jboss.tools.openshift.js/pom.xml
+++ b/plugins/org.jboss.tools.openshift.js/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.js</artifactId>
diff --git a/plugins/org.jboss.tools.openshift.ui/.classpath b/plugins/org.jboss.tools.openshift.ui/.classpath
index ab5d028cd..18a8bc213 100644
--- a/plugins/org.jboss.tools.openshift.ui/.classpath
+++ b/plugins/org.jboss.tools.openshift.ui/.classpath
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-validator-1.7.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin" path="resources">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.openshift.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.ui/META-INF/MANIFEST.MF
index ea5ebebe0..02d12a4ec 100644
--- a/plugins/org.jboss.tools.openshift.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.openshift.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.ui;singleton:=true
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.internal.ui.OpenShiftUIActivator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/plugins/org.jboss.tools.openshift.ui/pom.xml b/plugins/org.jboss.tools.openshift.ui/pom.xml
index ee8d8eec6..5973aceb7 100644
--- a/plugins/org.jboss.tools.openshift.ui/pom.xml
+++ b/plugins/org.jboss.tools.openshift.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.plugins</groupId>
 	<artifactId>org.jboss.tools.openshift.ui</artifactId> 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 02d5f0e89..6baa35e34 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>plugins</artifactId>
diff --git a/pom.xml b/pom.xml
index a7f98cf6e..7fde0bcf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	
 	<artifactId>openshift</artifactId>
 	<name>jbosstools-openshift</name>
-	<version>3.24.0-SNAPSHOT</version>
+	<version>3.24.100-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
 		<tycho.scmUrl>scm:git:https://github.com/jbosstools/jbosstools-openshift.git</tycho.scmUrl>
diff --git a/site/pom.xml b/site/pom.xml
index cdc04e941..9ede9338a 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>openshift.site</artifactId> 
diff --git a/test-framework/org.jboss.tools.openshift.reddeer/META-INF/MANIFEST.MF b/test-framework/org.jboss.tools.openshift.reddeer/META-INF/MANIFEST.MF
index 528cb2c3f..7a0767e18 100644
--- a/test-framework/org.jboss.tools.openshift.reddeer/META-INF/MANIFEST.MF
+++ b/test-framework/org.jboss.tools.openshift.reddeer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RedDeer API for OpenShift UI Tests
 Bundle-SymbolicName: org.jboss.tools.openshift.reddeer
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.reddeer.Activator
 Require-Bundle: 
  org.jboss.tools.openshift.ui,
diff --git a/test-framework/org.jboss.tools.openshift.reddeer/pom.xml b/test-framework/org.jboss.tools.openshift.reddeer/pom.xml
index cb0caa57b..42573e528 100644
--- a/test-framework/org.jboss.tools.openshift.reddeer/pom.xml
+++ b/test-framework/org.jboss.tools.openshift.reddeer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>test-framework</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.jboss.tools.openshift.reddeer</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 623d9a120..1789808e5 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>test-framework</artifactId>
diff --git a/tests/org.jboss.tools.openshift.cdk.server.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.openshift.cdk.server.test/META-INF/MANIFEST.MF
index 4934fda47..e40506dc2 100644
--- a/tests/org.jboss.tools.openshift.cdk.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.jboss.tools.openshift.cdk.server.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.cdk.server.test
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.jboss.tools.common.core;bundle-version="3.7.0",
diff --git a/tests/org.jboss.tools.openshift.cdk.server.test/pom.xml b/tests/org.jboss.tools.openshift.cdk.server.test/pom.xml
index 065df2b37..eed27206d 100644
--- a/tests/org.jboss.tools.openshift.cdk.server.test/pom.xml
+++ b/tests/org.jboss.tools.openshift.cdk.server.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.tests</groupId>
 	<artifactId>org.jboss.tools.openshift.cdk.server.test</artifactId>
diff --git a/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
index 8dd88dbe0..eee437a96 100644
--- a/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
+++ b/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.egit.test
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Activator: org.jboss.tools.openshift.egit.internal.test.EGitTestActivator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/tests/org.jboss.tools.openshift.egit.test/pom.xml b/tests/org.jboss.tools.openshift.egit.test/pom.xml
index 6f6bb66af..ce54e37eb 100644
--- a/tests/org.jboss.tools.openshift.egit.test/pom.xml
+++ b/tests/org.jboss.tools.openshift.egit.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.tests</groupId>
 	<artifactId>org.jboss.tools.openshift.egit.test</artifactId> 
diff --git a/tests/org.jboss.tools.openshift.test/.classpath b/tests/org.jboss.tools.openshift.test/.classpath
index c3785a31a..1ef053450 100644
--- a/tests/org.jboss.tools.openshift.test/.classpath
+++ b/tests/org.jboss.tools.openshift.test/.classpath
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
+	<classpathentry kind="src" output="bin" path="src">
 		<attributes>
-			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/mockserver-netty-no-dependencies-5.15.0.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.jboss.tools.openshift.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.openshift.test/META-INF/MANIFEST.MF
index 1a36b4987..b2d4c464d 100644
--- a/tests/org.jboss.tools.openshift.test/META-INF/MANIFEST.MF
+++ b/tests/org.jboss.tools.openshift.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.openshift.test
-Bundle-Version: 3.24.0.qualifier
+Bundle-Version: 3.24.100.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.jboss.tools.openshift.client;bundle-version="[3.0.0,4.0.0)",
diff --git a/tests/org.jboss.tools.openshift.test/pom.xml b/tests/org.jboss.tools.openshift.test/pom.xml
index dc1a65b57..0c33b49f3 100644
--- a/tests/org.jboss.tools.openshift.test/pom.xml
+++ b/tests/org.jboss.tools.openshift.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.openshift</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift.tests</groupId>
 	<artifactId>org.jboss.tools.openshift.test</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index e526d4622..3853f651c 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>openshift</artifactId>
-		<version>3.24.0-SNAPSHOT</version>
+		<version>3.24.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.openshift</groupId>
 	<artifactId>tests</artifactId>