diff --git a/releng/download/releases/9.3/compositeArtifacts.xml b/releng/download/releases/9.3/compositeArtifacts.xml
new file mode 100644
index 00000000000..e7fcc4e54f2
--- /dev/null
+++ b/releng/download/releases/9.3/compositeArtifacts.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT Oxygen Release Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='./cdt9.3.3'/>
+    <child location='../../launchbar/oxygen.0.1'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.3/compositeContent.xml b/releng/download/releases/9.3/compositeContent.xml
new file mode 100644
index 00000000000..1198552c9ca
--- /dev/null
+++ b/releng/download/releases/9.3/compositeContent.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT Oxygen Release Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='./cdt9.3.3'/>
+    <child location='../../launchbar/oxygen.0.1'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.4/compositeArtifacts.xml b/releng/download/releases/9.4/compositeArtifacts.xml
new file mode 100644
index 00000000000..d861c06f599
--- /dev/null
+++ b/releng/download/releases/9.4/compositeArtifacts.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT 9.4 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='5'>
+    <child location='../../launchbar/oxygen.2'/>
+    <child location='cdt-9.4.3'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.4/compositeContent.xml b/releng/download/releases/9.4/compositeContent.xml
new file mode 100644
index 00000000000..71aea4d30a3
--- /dev/null
+++ b/releng/download/releases/9.4/compositeContent.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT 9.4 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/oxygen.2'/>
+    <child location='cdt-9.4.3'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.5/compositeArtifacts.xml b/releng/download/releases/9.5/compositeArtifacts.xml
new file mode 100644
index 00000000000..5f3f15a3ffb
--- /dev/null
+++ b/releng/download/releases/9.5/compositeArtifacts.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT 9.5 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='3'>
+    <child location='../../launchbar/photon/m7'/>
+    <child location='../../launchbar/2.2/launchbar-2.2.1'/>
+    <child location='cdt-9.5.5'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.5/compositeContent.xml b/releng/download/releases/9.5/compositeContent.xml
new file mode 100644
index 00000000000..630fe0931b5
--- /dev/null
+++ b/releng/download/releases/9.5/compositeContent.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT 9.5 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='3'>
+    <child location='../../launchbar/photon/m7'/>
+    <child location='../../launchbar/2.2/launchbar-2.2.1'/>
+    <child location='cdt-9.5.5'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.6/compositeArtifacts.xml b/releng/download/releases/9.6/compositeArtifacts.xml
new file mode 100644
index 00000000000..c316b52ee6e
--- /dev/null
+++ b/releng/download/releases/9.6/compositeArtifacts.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT 9.6 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1545249519203'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/2.2/launchbar-2.2.2'/>
+    <child location='cdt-9.6.0'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.6/compositeContent.xml b/releng/download/releases/9.6/compositeContent.xml
new file mode 100644
index 00000000000..c62c9103e21
--- /dev/null
+++ b/releng/download/releases/9.6/compositeContent.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT 9.6 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1545249519203'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/2.2/launchbar-2.2.2'/>
+    <child location='cdt-9.6.0'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.7/compositeArtifacts.xml b/releng/download/releases/9.7/compositeArtifacts.xml
new file mode 100644
index 00000000000..d925abbd5d7
--- /dev/null
+++ b/releng/download/releases/9.7/compositeArtifacts.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT 9.7 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/2.2/launchbar-2.2.2'/>
+    <child location='cdt-9.7.2'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.7/compositeContent.xml b/releng/download/releases/9.7/compositeContent.xml
new file mode 100644
index 00000000000..b8c6ca8f247
--- /dev/null
+++ b/releng/download/releases/9.7/compositeContent.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT 9.7 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/2.2/launchbar-2.2.2'/>
+    <child location='cdt-9.7.2'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.8/compositeArtifacts.xml b/releng/download/releases/9.8/compositeArtifacts.xml
new file mode 100644
index 00000000000..0b70b534e8e
--- /dev/null
+++ b/releng/download/releases/9.8/compositeArtifacts.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT 9.8 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/2.3/launchbar-2.3.0'/>
+    <child location='cdt-9.8.1'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/9.8/compositeContent.xml b/releng/download/releases/9.8/compositeContent.xml
new file mode 100644
index 00000000000..4e1cece2869
--- /dev/null
+++ b/releng/download/releases/9.8/compositeContent.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT 9.8 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1673888544650'/>
+  </properties>
+  <children size='2'>
+    <child location='../../launchbar/2.3/launchbar-2.3.0'/>
+    <child location='cdt-9.8.1'/>
+  </children>
+</repository>
diff --git a/releng/scripts/promote-files-to-download.sh b/releng/scripts/promote-files-to-download.sh
index 2680c5c877a..80df37fb311 100755
--- a/releng/scripts/promote-files-to-download.sh
+++ b/releng/scripts/promote-files-to-download.sh
@@ -8,6 +8,7 @@ SSHUSER="genie.cdt@projects-storage.eclipse.org"
 SSH="ssh ${SSHUSER}"
 SCP="scp"
 DOWNLOAD=/home/data/httpd/download.eclipse.org/tools/cdt
+ARCHIVE=/home/data/httpd/archive.eclipse.org/tools/cdt
 
 ECHO=echo
 if [ "$DRY_RUN" == "false" ]; then
@@ -23,3 +24,13 @@ $ECHO $SCP ./releng/download/releases/latest/* "${SSHUSER}:${DOWNLOAD}/releases/
 $ECHO $SCP ./releng/download/releases/10.6/* "${SSHUSER}:${DOWNLOAD}/releases/10.6/"
 $ECHO $SCP ./releng/download/releases/10.7/* "${SSHUSER}:${DOWNLOAD}/releases/10.7/"
 $ECHO $SCP ./releng/download/releases/11.0/* "${SSHUSER}:${DOWNLOAD}/releases/11.0/"
+
+# Issue #235 - some of the old archived releases had bad composites. For those
+# ones we started maintaining the files here as it was the easiest way to edit
+# the files. Add more here as needed.
+$ECHO $SCP ./releng/download/releases/9.3/* "${SSHUSER}:${ARCHIVE}/releases/9.3/"
+$ECHO $SCP ./releng/download/releases/9.4/* "${SSHUSER}:${ARCHIVE}/releases/9.4/"
+$ECHO $SCP ./releng/download/releases/9.5/* "${SSHUSER}:${ARCHIVE}/releases/9.5/"
+$ECHO $SCP ./releng/download/releases/9.6/* "${SSHUSER}:${ARCHIVE}/releases/9.6/"
+$ECHO $SCP ./releng/download/releases/9.7/* "${SSHUSER}:${ARCHIVE}/releases/9.7/"
+$ECHO $SCP ./releng/download/releases/9.8/* "${SSHUSER}:${ARCHIVE}/releases/9.8/"