diff --git a/pom.xml b/pom.xml
index dbba6c1..ce3bb68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,13 +385,6 @@
 									<arch>x86_64</arch>
 								</environment>
 							</environments>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<version>${tycho.version}</version>
-						<configuration>
 							<dependency-resolution>
 								<extraRequirements>
 									<requirement>
@@ -477,13 +470,6 @@
 									<arch>x86_64</arch>
 								</environment>
 							</environments>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<version>${tycho.version}</version>
-						<configuration>
 							<dependency-resolution>
 								<extraRequirements>
 									<requirement>
diff --git a/releng/toolkit/downloads/updates/nightly/latest/2018-09/compositeArtifacts.xml b/releng/toolkit/downloads/updates/nightly/latest/2018-09/compositeArtifacts.xml
new file mode 100644
index 0000000..3e72782
--- /dev/null
+++ b/releng/toolkit/downloads/updates/nightly/latest/2018-09/compositeArtifacts.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='Gendoc Nightly - 2018-09'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='!!__TIMESTAMP__!!'/>
+  </properties>
+  <children size='1'>
+	<child location="https://ci.eclipse.org/gendoc/job/Gendoc-2018-09-nightly/lastSuccessfulBuild/artifact/repository" />
+  </children>
+</repository>
\ No newline at end of file
diff --git a/releng/toolkit/downloads/updates/nightly/latest/2018-09/compositeContent.xml b/releng/toolkit/downloads/updates/nightly/latest/2018-09/compositeContent.xml
new file mode 100644
index 0000000..1c3288b
--- /dev/null
+++ b/releng/toolkit/downloads/updates/nightly/latest/2018-09/compositeContent.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository
+	type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" name="Gendoc Nightly - 2018-09" version="1.0.0">
+	<properties size="1">
+		<property name="p2.timestamp" value="!!__TIMESTAMP__!!" />
+	</properties>
+	<children size="1">
+		<child location="https://ci.eclipse.org/gendoc/job/Gendoc-2018-09-nightly/lastSuccessfulBuild/artifact/repository" />
+	</children>
+</repository>
\ No newline at end of file
diff --git a/releng/toolkit/downloads/updates/nightly/latest/2018-09/p2.index b/releng/toolkit/downloads/updates/nightly/latest/2018-09/p2.index
new file mode 100644
index 0000000..c820f47
--- /dev/null
+++ b/releng/toolkit/downloads/updates/nightly/latest/2018-09/p2.index
@@ -0,0 +1,3 @@
+version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
\ No newline at end of file
diff --git a/releng/toolkit/downloads/updates/nightly/latest/2018-12/compositeArtifacts.xml b/releng/toolkit/downloads/updates/nightly/latest/2018-12/compositeArtifacts.xml
new file mode 100644
index 0000000..1582703
--- /dev/null
+++ b/releng/toolkit/downloads/updates/nightly/latest/2018-12/compositeArtifacts.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='Gendoc Nightly - 2018-12'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='!!__TIMESTAMP__!!'/>
+  </properties>
+  <children size='1'>
+	<child location="https://ci.eclipse.org/gendoc/job/Gendoc-2018-12-nightly/lastSuccessfulBuild/artifact/repository" />
+  </children>
+</repository>
\ No newline at end of file
diff --git a/releng/toolkit/downloads/updates/nightly/latest/2018-12/compositeContent.xml b/releng/toolkit/downloads/updates/nightly/latest/2018-12/compositeContent.xml
new file mode 100644
index 0000000..8e864b0
--- /dev/null
+++ b/releng/toolkit/downloads/updates/nightly/latest/2018-12/compositeContent.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository
+	type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" name="Gendoc Nightly - 2018-12" version="1.0.0">
+	<properties size="1">
+		<property name="p2.timestamp" value="!!__TIMESTAMP__!!" />
+	</properties>
+	<children size="1">
+		<child location="https://ci.eclipse.org/gendoc/job/Gendoc-2018-12-nightly/lastSuccessfulBuild/artifact/repository" />
+	</children>
+</repository>
\ No newline at end of file
diff --git a/releng/toolkit/downloads/updates/nightly/latest/2018-12/p2.index b/releng/toolkit/downloads/updates/nightly/latest/2018-12/p2.index
new file mode 100644
index 0000000..c820f47
--- /dev/null
+++ b/releng/toolkit/downloads/updates/nightly/latest/2018-12/p2.index
@@ -0,0 +1,3 @@
+version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
\ No newline at end of file
diff --git a/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeArtifacts.xml b/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeArtifacts.xml
index 6bd4755..376f4df 100644
--- a/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeArtifacts.xml
+++ b/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeArtifacts.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?compositeArtifactRepository version='1.0.0'?>
-<repository name='Gendoc Nightly - Neon'
+<repository name='Gendoc Nightly - Oxygen'
     type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
   <properties size='1'>
     <property name='p2.timestamp' value='!!__TIMESTAMP__!!'/>
diff --git a/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeContent.xml b/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeContent.xml
index 760c4f6..252b2fa 100644
--- a/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeContent.xml
+++ b/releng/toolkit/downloads/updates/nightly/latest/oxygen/compositeContent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?compositeMetadataRepository version='1.0.0'?>
 <repository
-	type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" name="Gendoc Nightly - Neon" version="1.0.0">
+	type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" name="Gendoc Nightly - Oxygen" version="1.0.0">
 	<properties size="1">
 		<property name="p2.timestamp" value="!!__TIMESTAMP__!!" />
 	</properties>
diff --git a/releng/toolkit/downloads/updates/nightly/latest/photon/compositeArtifacts.xml b/releng/toolkit/downloads/updates/nightly/latest/photon/compositeArtifacts.xml
index a7f1516..a8eed87 100644
--- a/releng/toolkit/downloads/updates/nightly/latest/photon/compositeArtifacts.xml
+++ b/releng/toolkit/downloads/updates/nightly/latest/photon/compositeArtifacts.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?compositeArtifactRepository version='1.0.0'?>
-<repository name='Gendoc Nightly - Neon'
+<repository name='Gendoc Nightly - Photon'
     type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
   <properties size='1'>
     <property name='p2.timestamp' value='!!__TIMESTAMP__!!'/>
diff --git a/releng/toolkit/downloads/updates/nightly/latest/photon/compositeContent.xml b/releng/toolkit/downloads/updates/nightly/latest/photon/compositeContent.xml
index c2e35c3..90db71f 100644
--- a/releng/toolkit/downloads/updates/nightly/latest/photon/compositeContent.xml
+++ b/releng/toolkit/downloads/updates/nightly/latest/photon/compositeContent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?compositeMetadataRepository version='1.0.0'?>
 <repository
-	type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" name="Gendoc Nightly - Neon" version="1.0.0">
+	type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" name="Gendoc Nightly - Photon" version="1.0.0">
 	<properties size="1">
 		<property name="p2.timestamp" value="!!__TIMESTAMP__!!" />
 	</properties>