diff --git a/bundles/org.eclipse.remote.doc.isv/pom.xml b/bundles/org.eclipse.remote.doc.isv/pom.xml
index b67845b8600..485a49cd8c4 100644
--- a/bundles/org.eclipse.remote.doc.isv/pom.xml
+++ b/bundles/org.eclipse.remote.doc.isv/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF
index 78fb0ea54a8..21b72aecada 100644
--- a/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.remote.serial.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.serial.internal.ui.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
index fe35a4479fa..20f5b252c50 100644
--- a/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.remote.telnet.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.telnet.internal.ui.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 28e9ae86f3f..a11e2a8c30e 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml
index 4c35e73b3f5..43c3d4dfa7c 100644
--- a/features/org.eclipse.remote-feature/feature.xml
+++ b/features/org.eclipse.remote-feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.remote"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
-   <description url="http://eclipse.org/ptp">
+   <description url="http://eclipse.org/remote">
       %description
    </description>
 
diff --git a/features/org.eclipse.remote.console-feature/feature.xml b/features/org.eclipse.remote.console-feature/feature.xml
index d671ade1e73..706baa28a72 100644
--- a/features/org.eclipse.remote.console-feature/feature.xml
+++ b/features/org.eclipse.remote.console-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote.console"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.proxy-feature/feature.xml b/features/org.eclipse.remote.proxy-feature/feature.xml
index 6c35c4c1a0f..e7ef53fa41c 100644
--- a/features/org.eclipse.remote.proxy-feature/feature.xml
+++ b/features/org.eclipse.remote.proxy-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote.proxy"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.serial-feature/feature.xml b/features/org.eclipse.remote.serial-feature/feature.xml
index 5ed6f5099b7..ffb41b7ec2e 100644
--- a/features/org.eclipse.remote.serial-feature/feature.xml
+++ b/features/org.eclipse.remote.serial-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote.serial"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.telnet-feature/feature.xml b/features/org.eclipse.remote.telnet-feature/feature.xml
index e427006ccc8..842e292dee9 100644
--- a/features/org.eclipse.remote.telnet-feature/feature.xml
+++ b/features/org.eclipse.remote.telnet-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote.telnet"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/pom.xml b/features/pom.xml
index 00fa52621c7..e45db28ce18 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index cace244c405..8afc8334589 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -10,20 +10,23 @@
 
 	<groupId>org.eclipse.remote</groupId>
 	<artifactId>remote-parent</artifactId>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Remote Parent</name>
 
 	<properties>
 		<remote-release>nightly</remote-release>
-		<tycho-version>1.6.0</tycho-version>
+		<!-- Maven 3.6.1 and 3.6.2 do not work with Tycho, see Bug 551674
+		     CDT enforces a minimum of 3.6.3 because that is what CDT's CI
+			 runs with. It may work with older versions, but this is not
+			 tested or supported. -->
+		<required-maven-version>3.6.3</required-maven-version>
+		<tycho-version>2.3.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git</tycho.scmUrl>
 		<platform-version>4.5</platform-version>
 		<platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}/</platform-site>
 		<license-site>http://download.eclipse.org/cbi/updates/license/</license-site>
-		<tm-site>http://download.eclipse.org/tm/terminal/builds/development/nightly/</tm-site>
-		<cdt-site>http://download.eclipse.org/tools/cdt/builds/master/nightly/</cdt-site>
 		<remote-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/remote/${remote-release}</remote-install-dir>
   		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
@@ -103,6 +106,32 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M3</version>
+				<executions>
+				<execution>
+					<id>enforce-maven-version</id>
+					<goals>
+						<goal>enforce</goal>
+					</goals>
+					<configuration>
+						<rules>
+							<requireMavenVersion>
+								<version>${required-maven-version}</version>
+							</requireMavenVersion>
+							<requireJavaVersion>
+								<version>11</version>
+							</requireJavaVersion>
+						</rules>
+						<fail>true</fail>
+						<failFast>true</failFast>
+					</configuration>
+				</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
@@ -167,8 +196,8 @@
 						<artifact>
 							<groupId>org.eclipse.remote</groupId>
 							<artifactId>org.eclipse.remote.target</artifactId>
-							<version>3.0.1-SNAPSHOT</version>
-							<classifier>photon</classifier>
+							<version>3.0.2-SNAPSHOT</version>
+							<classifier>remote</classifier>
 						</artifact>
 				  </target>
 				</configuration>
@@ -328,12 +357,12 @@
 		<profile>
 			<id>eclipse-sign</id>
 			<pluginRepositories>
-				<pluginRepository>
-					<id>m2e-cbi</id>
-					<url>http://download.eclipse.org/technology/m2e/maven/</url>
+		   		<pluginRepository>
+					<id>cbi</id>
+					<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
 				</pluginRepository>
-			</pluginRepositories>
-
+		  	</pluginRepositories>
+  	
 			<build>
 				<plugins>
 					<plugin>
@@ -344,49 +373,20 @@
 							<includePackedArtifacts>true</includePackedArtifacts>
 						</configuration>
 					</plugin>
-
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200a-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-normalize</id>
-								<goals>
-									<goal>normalize</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-
 					<plugin>
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<version>1.0.1</version>
+						<version>${cbi-plugins.version}</version>
 						<executions>
 							<execution>
 								<id>sign</id>
+								<phase>verify</phase>
 								<goals>
 									<goal>sign</goal>
 								</goals>
 							</execution>
 						</executions>
 					</plugin>
-
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200b-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-pack</id>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-p2-plugin</artifactId>
@@ -397,7 +397,7 @@
 								<goals>
 									<goal>p2-metadata</goal>
 								</goals>
-								<phase>package</phase>
+								<phase>verify</phase>
 							</execution>
 						</executions>
 						<configuration>
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
index 07b046c24e6..1855007c436 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -8,13 +8,13 @@
 	<parent>
 		<groupId>org.eclipse.remote</groupId>
 		<artifactId>remote-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.2-SNAPSHOT</version>
 		<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.remote</groupId>
 	<artifactId>remote-core</artifactId>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/releng/org.eclipse.remote.proxy.server.product/pom.xml b/releng/org.eclipse.remote.proxy.server.product/pom.xml
index 88cac5c3424..ca5fad3f61e 100644
--- a/releng/org.eclipse.remote.proxy.server.product/pom.xml
+++ b/releng/org.eclipse.remote.proxy.server.product/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
 	<artifactId>org.eclipse.remote.proxy.server.product</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.0</version>
 	<packaging>eclipse-repository</packaging>
 	
 	<build>
diff --git a/releng/org.eclipse.remote.repo/pom.xml b/releng/org.eclipse.remote.repo/pom.xml
index 3fa927fad2d..2e7da9e656b 100644
--- a/releng/org.eclipse.remote.repo/pom.xml
+++ b/releng/org.eclipse.remote.repo/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.remote</groupId>
 		<artifactId>remote-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.2-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.remote.target/mars.target b/releng/org.eclipse.remote.target/mars.target
deleted file mode 100644
index 17f384367f1..00000000000
--- a/releng/org.eclipse.remote.target/mars.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="remote-mars" sequenceNumber="0">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.mockito" version="0.0.0"/>
-<unit id="org.hamcrest" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
-<unit id="org.eclipse.cdt.core" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.remote.target/neon.target b/releng/org.eclipse.remote.target/neon.target
deleted file mode 100644
index f6329af9b68..00000000000
--- a/releng/org.eclipse.remote.target/neon.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="remote-neon" sequenceNumber="0">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.mockito" version="0.0.0"/>
-<unit id="org.hamcrest" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
-<unit id="org.eclipse.cdt.core" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.remote.target/oxygen.target b/releng/org.eclipse.remote.target/oxygen.target
deleted file mode 100644
index f3a2707f1bf..00000000000
--- a/releng/org.eclipse.remote.target/oxygen.target
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="remote-oxygen" sequenceNumber="0">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.hamcrest" version="0.0.0"/>
-<unit id="org.mockito" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.core" version="0.0.0"/>
-<unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/nightly/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.remote.target/pom.xml b/releng/org.eclipse.remote.target/pom.xml
index 9ea59643f29..a3c6a9a5d36 100644
--- a/releng/org.eclipse.remote.target/pom.xml
+++ b/releng/org.eclipse.remote.target/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.remote</groupId>
 		<artifactId>remote-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.2-SNAPSHOT</version>
 		<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
 	</parent>
 
@@ -30,7 +30,7 @@
 						<configuration>
 							<artifacts>
 								<artifact>
-									<file>photon.target</file>
+									<file>remote.target</file>
 									<type>target</type>
 									<classifier>remote-photon</classifier>
 								</artifact>
diff --git a/releng/org.eclipse.remote.target/photon.target b/releng/org.eclipse.remote.target/remote.target
similarity index 75%
rename from releng/org.eclipse.remote.target/photon.target
rename to releng/org.eclipse.remote.target/remote.target
index d3efc141a0e..6df912562fb 100644
--- a/releng/org.eclipse.remote.target/photon.target
+++ b/releng/org.eclipse.remote.target/remote.target
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="remote-photon" sequenceNumber="1">
+<?pde version="3.8"?>
+<target name="remote" sequenceNumber="1">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -8,22 +9,20 @@
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.hamcrest" version="0.0.0"/>
 <unit id="org.mockito" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.14/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.core" version="0.0.0"/>
 <unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/9.10/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tm/updates/4.5.102-SNAPSHOT/repository/"/>
+<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.3/cdt-10.3.0/"/>
 </location>
 </locations>
-</target>
+</target>
\ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index 9d20bc841f5..09e4e924ebf 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>