diff --git a/.github/scripts/generate-composite-site-files.sh b/.github/scripts/generate-composite-site-files.sh
index ea66e532c..206de90d6 100755
--- a/.github/scripts/generate-composite-site-files.sh
+++ b/.github/scripts/generate-composite-site-files.sh
@@ -1,8 +1,6 @@
 val=$1
 url=$2
-justj21=$3
-
-echo "Include JustJ bit: ${justj21}"
+eversion=$3
 
 rm -f ./compositeArtifacts.xml
 rm -f ./compositeContent.xml
@@ -15,10 +13,10 @@ echo "    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArt
 echo "  <properties size='1'>" >> compositeArtifacts.xml
 echo "    <property name='p2.timestamp' value='${val}'/>" >> compositeArtifacts.xml
 echo "  </properties>" >> compositeArtifacts.xml
-if [ "${justj21}" = true ] ; then
+if [[ ${eversion} == "e4.36" ]]; then
   echo "  <children size='2'>" >> compositeArtifacts.xml
   echo "    <child location='${url}'/>" >> compositeArtifacts.xml
-  echo "    <child location='https://download.eclipse.org/justj/jres/21/updates/release/latest/'/>" >> compositeArtifacts.xml
+  echo "    <child location='https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06/'/>" >> compositeArtifacts.xml
   echo "  </children>" >> compositeArtifacts.xml
 else
   echo "  <children size='1'>" >> compositeArtifacts.xml
@@ -34,10 +32,10 @@ echo "    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMet
 echo "  <properties size='1'>" >> compositeContent.xml
 echo "    <property name='p2.timestamp' value='${val}'/>" >> compositeContent.xml
 echo "  </properties>" >> compositeContent.xml
-if [ "${justj21}" = true ] ; then
+if [[ ${eversion} == "e4.36" ]]; then
   echo "  <children size='2'>" >> compositeContent.xml
   echo "    <child location='${url}'/>" >> compositeContent.xml
-  echo "    <child location='https://download.eclipse.org/justj/jres/21/updates/release/latest/'/>" >> compositeContent.xml
+  echo "    <child location='https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06/'/>" >> compositeContent.xml
   echo "  </children>" >> compositeContent.xml
 else
   echo "  <children size='1'>" >> compositeContent.xml
diff --git a/.github/workflows/aggregate-distro-update-sites.yml b/.github/workflows/aggregate-distro-update-sites.yml
index e9c4ef13a..663fe1177 100644
--- a/.github/workflows/aggregate-distro-update-sites.yml
+++ b/.github/workflows/aggregate-distro-update-sites.yml
@@ -61,35 +61,31 @@ jobs:
               echo "Found ${dir}"
               dir_name=${dir:0:-1}
               site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}"
-              if [[ ${dir_name} == "e4.30" ]]; then 
-                  ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url 
-              else
-                  ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url true
-              fi
+              ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url $dir_name
               cat ./compositeArtifacts.xml
               cat ./compositeContent.xml
-              if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
-                aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
-                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
-                aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
-                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeContent.xml "
-                aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
-                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/p2.index "
-                echo "TODO: Purge Cache"
-              fi
-              aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
-              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
-              aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
-              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
-              aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
-              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/p2.index "
+#              if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
+#                aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
+#                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
+#                aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
+#                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeContent.xml "
+#                aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
+#                invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/p2.index "
+#                echo "TODO: Purge Cache"
+#              fi
+#              aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
+#              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
+#              aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
+#              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
+#              aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
+#              invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/p2.index "
             fi
           done
           echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
-      - uses: ./.github/actions/cloudflare-purge
-        name: Invalidate URLs
-        with:
-          urls: ${{ steps.gen-aggregate-sites.outputs.invalid_urls }}
-          cloudflare_zone_id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-          cloudflare_cache_token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
+#      - uses: ./.github/actions/cloudflare-purge
+#        name: Invalidate URLs
+#        with:
+#          urls: ${{ steps.gen-aggregate-sites.outputs.invalid_urls }}
+#          cloudflare_zone_id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
+#          cloudflare_cache_token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}