diff --git a/Downloads.md b/Downloads.md
index 003489a6c96..2f27ab1e669 100644
--- a/Downloads.md
+++ b/Downloads.md
@@ -437,11 +437,6 @@ Archived p2 repos:
   There is limited information preserved about these old releases. Some of the download files are available on <https://archive.eclipse.org/tools/cdt/releases/> and <https://archive.eclipse.org/tools/cdt/updates/>
 </details>
 
-### Development Builds
-
-Development builds of the Eclipse C/C++ IDE can be found on the [Eclipse Downloads page](https://www.eclipse.org/downloads/packages/) by clicking on the Eclipse Developer Builds tab.
-
-Bleeding edge continuous (aka nightly) builds are available from the [cdt/main Jenkins build page](https://ci.eclipse.org/cdt/job/cdt/job/main/) and the p2 software repository: <https://ci.eclipse.org/cdt/job/cdt/job/main/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/>
   
 ### Additional Distributions
 
diff --git a/FAQ/README.md b/FAQ/README.md
index a28e3eddd7f..584c0c979c4 100644
--- a/FAQ/README.md
+++ b/FAQ/README.md
@@ -280,7 +280,7 @@ update site.
 
 2. You can take the bleeding edge updates from nightly builds (they are
 usually quite stable). The update site for most recent nightly builds is
-<http://download.eclipse.org/tools/cdt/builds/master/nightly>
+<https://download.eclipse.org/tools/cdt/builds/cdt/main/>
 
 #### I can't find the CDT download for the XXX operating system?
 
@@ -2413,7 +2413,7 @@ The path to windres.exe must be known to eclipse.
 
 #### How do I get a more recent build than is on the downloads page?
 
-<http://download.eclipse.org/tools/cdt/builds/>
+<https://download.eclipse.org/tools/cdt/builds/cdt/main/>
 
 These plugin builds can be installed for use in the usual way via
 Software Updates -\> Find and Install... but are packed which the
diff --git a/Jenkinsfile b/Jenkinsfile
index ca99350d270..581d59b2b1e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,6 +59,40 @@ pipeline {
         }
       }
     }
+    stage('Deploy Snapshot') {
+      steps {
+        container('jnlp') {
+          timeout(activity: true, time: 20) {
+            sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
+              sh '''
+                  SSHUSER="genie.cdt@projects-storage.eclipse.org"
+                  SSH="ssh ${SSHUSER}"
+                  SCP="scp"
+
+
+                  DOWNLOAD=download.eclipse.org/tools/cdt/builds/cdt/$BRANCH_NAME
+                  DOWNLOAD_MOUNT=/home/data/httpd/$DOWNLOAD
+
+                  # Deploying build to nightly location on download.eclipse.org
+                  if $SSH test -e ${DOWNLOAD_MOUNT}-new; then
+                      $SSH rm -r ${DOWNLOAD_MOUNT}-new
+                  fi
+                  if $SSH test -e ${DOWNLOAD_MOUNT}-last; then
+                      $SSH rm -r ${DOWNLOAD_MOUNT}-last
+                  fi
+                  $SSH mkdir -p ${DOWNLOAD_MOUNT}-new
+                  $SCP -rp releng/org.eclipse.cdt.repo/target/repository/* "${SSHUSER}:"${DOWNLOAD_MOUNT}-new
+                  $SCP -rp releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip "${SSHUSER}:"${DOWNLOAD_MOUNT}-new
+                  if $SSH test -e ${DOWNLOAD_MOUNT}; then
+                      $SSH mv ${DOWNLOAD_MOUNT} ${DOWNLOAD_MOUNT}-last
+                  fi
+                  $SSH mv ${DOWNLOAD_MOUNT}-new ${DOWNLOAD_MOUNT}
+              '''
+            }
+          }
+        }
+      }
+    }
   }
   post {
     always {
diff --git a/README.md b/README.md
index b3fec14da6d..7c0ed197134 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,21 @@ See also https://projects.eclipse.org/projects/tools.cdt and https://eclipse.org
 
 ## Download
 
-The recommended way to obtain Eclipse CDT is to download it as part of the complete *Eclipse IDE for C/C++ Developers* or *Eclipse IDE for Embedded C/C++ Developers* or *Eclipse IDE for Scientific Computing* from the main [Eclipse IDE download site](https://eclipseide.org/release/).
+The recommended way to obtain Eclipse CDT is to download it as part of the complete *Eclipse IDE for C/C++ Developers* or *Eclipse IDE for Embedded C/C++ Developers* from the main [Eclipse IDE download site](https://eclipseide.org/release/).
 
 Alternatively Eclipse CDT can be installed into an existing Eclipse installation using this p2 URL: `https://download.eclipse.org/tools/cdt/releases/latest/` ([see how](https://help.eclipse.org/topic/org.eclipse.platform.doc.user/tasks/tasks-127.htm))
 
+### Download Development Builds
+
+Milestone builds of the *Eclipse IDE for C/C++ Developers* or *Eclipse IDE for Embedded C/C++ Developers* can be found on the [Eclipse Downloads page](https://www.eclipse.org/downloads/packages/) by clicking on the Eclipse Developer Builds tab (only present when there is a milestone build newer than the latest release).
+
+Alternatively, milestone builds of Eclipse CDT can be installed into an existing Eclipse installation using one of the p2 URLs in: <https://download.eclipse.org/tools/cdt/builds> ([see how](https://help.eclipse.org/topic/org.eclipse.platform.doc.user/tasks/tasks-127.htm)).
+See [cdt.aggrcon](https://github.com/eclipse-simrel/simrel.build/blob/main/cdt.aggrcon#L3) for which milestone is currently contributed to Eclipse SimRel.
+
+Bleeding edge continuous (aka nightly) builds are available for the main branch from the p2 software repository: `https://download.eclipse.org/tools/cdt/builds/cdt/main/`
+
+### Download older versions
+
 Downloads links for older versions are available in [Downloads](Downloads.md).
 
 ## Help & Support
diff --git a/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml b/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml
index d2219f58aee..f037ee156f1 100644
--- a/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml
+++ b/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml
@@ -20,6 +20,8 @@ spec:
       readOnly: true
     - name: m2-repo
       mountPath: /home/jenkins/.m2/repository
+    - name: volume-known-hosts
+      mountPath: /home/jenkins/.ssh
     - name: "jenkins-home"
       mountPath: "/home/jenkins"
       readOnly: false
@@ -33,6 +35,9 @@ spec:
       limits:
         memory: "512Mi"
         cpu: "500m"
+    volumeMounts:
+    - name: volume-known-hosts
+      mountPath: /home/jenkins/.ssh
   volumes:
   - name: settings-xml
     secret:
@@ -42,6 +47,9 @@ spec:
         path: settings.xml
   - name: m2-repo
     emptyDir: {}
+  - name: volume-known-hosts
+    configMap:
+      name: known-hosts
   - name: "jenkins-home"
     emptyDir: {}
   - name: tools