diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile
index bb2c7b3e96d..44162c9c0cf 100644
--- a/JenkinsJobs/Builds/build.jenkinsfile
+++ b/JenkinsJobs/Builds/build.jenkinsfile
@@ -419,8 +419,8 @@ pipeline {
 									popd
 									
 									# Gather Equinox SDK
-									pushd ${PRODUCTS_DIR}/equinox-sdk/target
-									cp equinox-sdk-*-SNAPSHOT.zip ${EQUINOX_DROP_DIR}/${BUILD_ID}/equinox-SDK-$BUILD_ID.zip
+									pushd ${SITES_DIR}/equinox-sdk-repository/target
+									cp equinox-sdk-repository.eclipse-repository-*.zip ${EQUINOX_DROP_DIR}/${BUILD_ID}/equinox-SDK-${BUILD_ID}.zip
 									popd
 									pushd ${EQUINOX_DROP_DIR}/${BUILD_ID}
 										unzip -o -j equinox-SDK-$BUILD_ID.zip plugins/*.jar -x plugins/*.source_*
diff --git a/products/equinox-sdk/equinox-sdk.product b/products/equinox-sdk/equinox-sdk.product
deleted file mode 100644
index 9b03d90586d..00000000000
--- a/products/equinox-sdk/equinox-sdk.product
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product uid="org.eclipse.equinox.sdk.product" version="4.40.0.qualifier" useFeatures="true" includeLaunchers="false">
-
-   <license>
-        <url>https://www.eclipse.org/legal/epl/notice</url>
-        <text>
-   Eclipse Foundation Software User Agreement
-
-November 22, 2017
-
-Usage Of Content
-
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
-Unless otherwise indicated, all Content made available by the Eclipse Foundation
-is provided to you under the terms and conditions of the Eclipse Public License
-Version 2.0 (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also
-available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
-&quot;Program&quot; will mean the Content.
-
-Content includes, but is not limited to, source code, object code, documentation
-and other files maintained in the Eclipse Foundation source code repository
-(&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as
-downloadable archives (&quot;Downloads&quot;).
-
--   Content may be structured and packaged into modules to facilitate
-    delivering, extending, and upgrading the Content. Typical modules may
-    include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and
-    features (&quot;Features&quot;).
--   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
-    (Java&#8482; ARchive) in a directory named &quot;plugins&quot;.
--   A Feature is a bundle of one or more Plug-ins and/or Fragments and
-    associated material. Each Feature may be packaged as a sub-directory in a
-    directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may
-    contain a list of the names and version numbers of the Plug-ins and/or
-    Fragments associated with that Feature.
--   Features may also include other Features (&quot;Included Features&quot;). Within a
-    Feature, files named &quot;feature.xml&quot; may contain a list of the names and
-    version numbers of Included Features.
-
-The terms and conditions governing Plug-ins and Fragments should be contained in
-files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features
-and Included Features should be contained in files named &quot;license.html&quot;
-(&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:
-
--   The top-level (root) directory
--   Plug-in and Fragment directories
--   Inside Plug-ins and Fragments packaged as JARs
--   Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
--   Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using
-the Provisioning Technology (as defined below), you must agree to a license
-(&quot;Feature Update License&quot;) during the installation process. If the Feature
-contains Included Features, the Feature Update License should either provide you
-with the terms and conditions governing the Included Features or inform you
-where you can locate them. Feature Update Licenses may be found in the &quot;license&quot;
-property of files named &quot;feature.properties&quot; found within a Feature. Such
-Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
-conditions (or references to such terms and conditions) that govern your use of
-the associated Content in that directory.
-
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
-
--   Eclipse Public License Version 1.0 (available at
-    http://www.eclipse.org/legal/epl-v10.html)
--   Eclipse Distribution License Version 1.0 (available at
-    http://www.eclipse.org/licenses/edl-v1.0.html)
--   Common Public License Version 1.0 (available at
-    http://www.eclipse.org/legal/cpl-v10.html)
--   Apache Software License 1.1 (available at
-    http://www.apache.org/licenses/LICENSE)
--   Apache Software License 2.0 (available at
-    http://www.apache.org/licenses/LICENSE-2.0)
--   Mozilla Public License Version 1.1 (available at
-    http://www.mozilla.org/MPL/MPL-1.1.html)
-
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
-USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.
-
-Use of Provisioning Technology
-
-The Eclipse Foundation makes available provisioning software, examples of which
-include, but are not limited to, p2 and the Eclipse Update Manager
-(&quot;Provisioning Technology&quot;) for the purpose of allowing users to install
-software, documentation, information and/or other materials (collectively
-&quot;Installable Software&quot;). This capability is provided with the intent of allowing
-such users to install, extend and update Eclipse-based products. Information
-about packaging Installable Software is available at
-http://eclipse.org/equinox/p2/repository_packaging.html (&quot;Specification&quot;).
-
-You may use Provisioning Technology to allow other parties to install
-Installable Software. You shall be responsible for enabling the applicable
-license agreements relating to the Installable Software to be presented to, and
-accepted by, the users of the Provisioning Technology in accordance with the
-Specification. By using Provisioning Technology in such a manner and making it
-available in accordance with the Specification, you further acknowledge your
-agreement to, and the acquisition of all necessary rights to permit the
-following:
-
-1.  A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may
-    execute the Provisioning Technology on a machine (&quot;Target Machine&quot;) with the
-    intent of installing, extending or updating the functionality of an
-    Eclipse-based product.
-2.  During the Provisioning Process, the Provisioning Technology may cause third
-    party Installable Software or a portion thereof to be accessed and copied to
-    the Target Machine.
-3.  Pursuant to the Specification, you will provide to the user the terms and
-    conditions that govern the use of the Installable Software (&quot;Installable
-    Software Agreement&quot;) and such Installable Software Agreement shall be
-    accessed from the Target Machine in accordance with the Specification. Such
-    Installable Software Agreement must inform the user of the terms and
-    conditions that govern the Installable Software and must solicit acceptance
-    by the end user in the manner prescribed in such Installable
-    Software Agreement. Upon such indication of agreement by the user, the
-    provisioning Technology will complete installation of the
-    Installable Software.
-
-Cryptography
-
-Content may contain encryption software. The country in which you are currently
-may have restrictions on the import, possession, and use, and/or re-export to
-another country, of encryption software. BEFORE using any encryption software,
-please check the country&apos;s laws, regulations and policies concerning the import,
-possession, or use, and re-export of encryption software, to see if this is
-permitted.
-
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the
-United States, other countries, or both.
-         </text>
-   </license>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.eclipse.equinox.sdk"/>
-      <feature id="org.eclipse.equinox.p2.sdk"/>
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
-      <feature id="org.eclipse.core.runtime.feature"/>
-   </features>
-
-
-</product>
diff --git a/products/equinox-sdk/pom.xml b/products/equinox-sdk/pom.xml
deleted file mode 100644
index 1f1648d6087..00000000000
--- a/products/equinox-sdk/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2014, 2026 IBM Corporation, and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10
-
-  Contributors:
-     David Williams - initial implementation
-
-  The "equinox-sdk.project" is merely a convenient way to provide
-  the equinox-SDK zip file, for download from Equinox page.
-  The "product" is not intended to be used as a "product" and is
-  not intended to be part of the repository. Adopters are encouraged
-  to use the individual features this product collects together (or some
-  sub-set of them) for use in products).
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>products</artifactId>
-    <version>4.40.0-SNAPSHOT</version>
-  </parent>
-
-
-  <artifactId>equinox-sdk</artifactId>
-  <packaging>eclipse-repository</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-repository-plugin</artifactId>
-        <configuration>
-          <includeAllDependencies>false</includeAllDependencies>
-          <includeAllSources>true</includeAllSources>
-          <compress>false</compress>
-          <repositoryName>Eclipse Equinox and p2 runtime target repository</repositoryName>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/products/pom.xml b/products/pom.xml
index 1c4979344f2..6256663b80a 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -33,11 +33,8 @@
 		<module>equinox-launcher</module>
 		<module>equinox-starterkit</module>
 		<module>eclipse-junit-tests</module>
-		<module>equinox-sdk</module>
 	</modules>
 
-	<!-- TODO: Move site like products (e.g. equinox-sdk and junit-tests) into sites folder, which also avoids inheriting (for them) unwanted configuration?-->
-	
 	<properties>
 		<!-- If product.installSources is set to true,
 		repository.includeAllSources must always be true too.
@@ -97,7 +94,7 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>eclipse-sign</id>
diff --git a/scripts/releng/BuildDropDataGenerator.java b/scripts/releng/BuildDropDataGenerator.java
index f013c2bd5ba..50408530fed 100644
--- a/scripts/releng/BuildDropDataGenerator.java
+++ b/scripts/releng/BuildDropDataGenerator.java
@@ -13,6 +13,8 @@
  *     Hannes Wellmann - initial API and implementation
  *******************************************************************************/
 
+import static java.util.function.Predicate.not;
+
 import java.util.Map.Entry;
 
 import utilities.JSON;
@@ -139,15 +141,16 @@ void mainEquinoxPageData() throws IOException {
 	buildProperties.add("equinoxRepository",
 			collectFileEntries(files, filename -> filename.startsWith("equinox-SDK-")));
 
-	buildProperties.add("equinoxFramework",
-			collectFileEntries(files, filename -> filename.startsWith("org.eclipse.osgi_")));
+	Predicate<String> isOSGiBundle = filename -> filename.startsWith("org.eclipse.osgi_");
+	buildProperties.add("equinoxFramework", collectFileEntries(files, isOSGiBundle));
 
 	Predicate<String> isAddonBundle = filename -> (filename.startsWith("org.eclipse.equinox.")
 			|| filename.startsWith("org.eclipse.osgi.")) && !filename.startsWith("org.eclipse.equinox.p2.");
 	Predicate<String> isJar = filename -> filename.endsWith(".jar");
 
 	buildProperties.add("addonBundles", collectFileEntries(files, isAddonBundle.and(isJar)));
-	buildProperties.add("otherBundles", collectFileEntries(files, isAddonBundle.negate().and(isJar)));
+	buildProperties.add("otherBundles",
+			collectFileEntries(files, not(isAddonBundle).and(not(isOSGiBundle)).and(isJar)));
 
 	buildProperties.add("launchers", collectFileEntries(files, filename -> filename.startsWith("launchers-")));
 
diff --git a/sites/eclipse-platform-repository/build.properties b/sites/eclipse-platform-repository/build.properties
index 05f3fa901af..cb685bbe087 100644
--- a/sites/eclipse-platform-repository/build.properties
+++ b/sites/eclipse-platform-repository/build.properties
@@ -1,3 +1,4 @@
 # Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
 pom.model.property.repository.name = Eclipse ${releaseVersion}
+pom.model.property.repository.includeAllDependencies = true
 pom.model.property.eclipse.signing.skip = false
diff --git a/sites/equinox-sdk-repository/build.properties b/sites/equinox-sdk-repository/build.properties
new file mode 100644
index 00000000000..12078db331c
--- /dev/null
+++ b/sites/equinox-sdk-repository/build.properties
@@ -0,0 +1,4 @@
+# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
+pom.model.property.repository.name = Equinox and Eclipse p2 ${releaseVersion}
+pom.model.property.repository.includeAllDependencies = false
+pom.model.property.eclipse.signing.skip = false
diff --git a/sites/equinox-sdk-repository/category.xml b/sites/equinox-sdk-repository/category.xml
new file mode 100644
index 00000000000..a5b1897c04f
--- /dev/null
+++ b/sites/equinox-sdk-repository/category.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.equinox.sdk"/>
+   <feature id="org.eclipse.equinox.p2.sdk"/>
+   <feature id="org.eclipse.core.runtime.feature"/>
+</site>
diff --git a/sites/pom.xml b/sites/pom.xml
index dc0e8ef8e31..d4663e2265c 100644
--- a/sites/pom.xml
+++ b/sites/pom.xml
@@ -16,7 +16,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse-platform-parent</artifactId>
@@ -29,6 +29,7 @@
 
 	<modules>
 		<module>eclipse-platform-repository</module>
+		<module>equinox-sdk-repository</module>
 	</modules>
 
 	<build>
@@ -38,7 +39,7 @@
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-p2-repository-plugin</artifactId>
 					<configuration>
-						<includeAllDependencies>true</includeAllDependencies>
+						<includeAllDependencies>${repository.includeAllDependencies}</includeAllDependencies>
 						<includeAllSources>true</includeAllSources>
 						<repositoryName>${repository.name}</repositoryName>
 					</configuration>
@@ -46,7 +47,7 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>eclipse-sign</id>