diff --git a/pom.xml b/pom.xml
index bcdd8edea..e94240949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,7 @@
 	<modules>
 		<module>./releng/org.eclipse.passage.target</module>
 		<module>./releng/org.eclipse.passage.aggregator</module>
-		<!-- enable and fix after 3.0.0 RC2 -->
-		<!--
 		<module>sites/org.eclipse.passage.repository</module>
-		-->
 	</modules>
 
 </project>
diff --git a/releng/org.eclipse.passage.aggregator/pom.xml b/releng/org.eclipse.passage.aggregator/pom.xml
index abf1efb88..c8724e5db 100644
--- a/releng/org.eclipse.passage.aggregator/pom.xml
+++ b/releng/org.eclipse.passage.aggregator/pom.xml
@@ -109,20 +109,14 @@
 		<module>../../bundles/org.eclipse.passage.lic.define.branding</module>
 		<module>../../features/org.eclipse.passage.lic.define.feature</module>
 
-		<module>../../releng/org.eclipse.passage.lic.repository</module>
-
 		<module>../../bundles/org.eclipse.passage.ldc.pde.core.templates</module>
 		<module>../../bundles/org.eclipse.passage.ldc.pde.ui.templates</module>
 		<module>../../bundles/org.eclipse.passage.ldc</module>
 		<module>../../features/org.eclipse.passage.ldc.feature</module>
 
-		<module>../../releng/org.eclipse.passage.ldc.repository</module>
-
 		<module>../../bundles/org.eclipse.passage.seal.demo</module>
 		<module>../../features/org.eclipse.passage.demo.feature</module>
 		<module>../../tests/org.eclipse.passage.seal.demo.tests</module>
-
-		<module>../../releng/org.eclipse.passage.demo.repository</module>
 	</modules>
 
 </project>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.demo.repository/category.xml b/releng/org.eclipse.passage.demo.repository/category.xml
deleted file mode 100644
index 007963b10..000000000
--- a/releng/org.eclipse.passage.demo.repository/category.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018, 2021 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<site>
-	<category-def
-		name="org.eclipse.passage.demo.category"
-		label="Eclipse Passage Demo">
-		<description>
-			Eclipse Passage Demo contains final licensing runtime assembly
-		</description>
-	</category-def>
-	<feature
-		id="org.eclipse.passage.demo.feature">
-		<category name="org.eclipse.passage.demo.category" />
-	</feature>
-</site>
diff --git a/releng/org.eclipse.passage.demo.repository/pom.xml b/releng/org.eclipse.passage.demo.repository/pom.xml
deleted file mode 100644
index fc800460a..000000000
--- a/releng/org.eclipse.passage.demo.repository/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2020, 2024 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>org.eclipse.passage.demo.repository</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<parent>
-		<groupId>org.eclipse.passage</groupId>
-		<artifactId>org.eclipse.passage.parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
-		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<inherited>true</inherited>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<id>archive-repository</id>
-						<goals>
-							<goal>archive-repository</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${build.label}</finalName>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.ldc.repository/category.xml b/releng/org.eclipse.passage.ldc.repository/category.xml
deleted file mode 100644
index 011f7f04e..000000000
--- a/releng/org.eclipse.passage.ldc.repository/category.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2019, 2022 ArSysOp and others
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License 2.0 which is available at
- https://www.eclipse.org/legal/epl-2.0/.
-
- SPDX-License-Identifier: EPL-2.0
-
- Contributors:
-     ArSysOp - initial API and implementation
--->
-<site>
-   <feature id="org.eclipse.passage.ldc.feature">
-      <category name="org.eclipse.passage.ldc.category"/>
-   </feature>
-   <feature id="org.eclipse.passage.ldc.feature.source">
-      <category name="org.eclipse.passage.ldc.category.source"/>
-   </feature>
-   <bundle id="bcpg"/>
-   <bundle id="bcpg.source"/>
-   <bundle id="bcpkix"/>
-   <bundle id="bcpkix.source"/>
-   <bundle id="bcprov"/>
-   <bundle id="bcprov.source"/>
-   <bundle id="bcutil"/>
-   <bundle id="bcutil.source"/>
-   <bundle id="com.github.oshi.oshi-core"/>
-   <bundle id="com.github.oshi.oshi-core.source"/>
-   <bundle id="com.sun.jna"/>
-   <bundle id="com.sun.jna.source"/>
-   <bundle id="com.sun.jna.platform"/>
-   <bundle id="com.sun.jna.platform.source"/>
-   <bundle id="slf4j.api"/>
-   <bundle id="slf4j.api.source"/>
-   <bundle id="slf4j.nop"/>
-   <bundle id="slf4j.nop.source"/>
-   <category-def name="org.eclipse.passage.ldc.category" label="Passage LDC">
-      <description>
-         Passage Licensing Definition Components: 
-    Eclipse PDE integration&quot;
-      </description>
-   </category-def>
-   <category-def name="org.eclipse.passage.ldc.category.source" label="Passage LDC Developer Resources">
-      <description>
-         Passage Licensing Definition Components Developer Resources: 
-    Eclipse PDE integration&quot;
-      </description>
-   </category-def>
-</site>
diff --git a/releng/org.eclipse.passage.ldc.repository/pom.xml b/releng/org.eclipse.passage.ldc.repository/pom.xml
deleted file mode 100644
index 29e62bff0..000000000
--- a/releng/org.eclipse.passage.ldc.repository/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2019, 2024 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>org.eclipse.passage.ldc.repository</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<parent>
-		<groupId>org.eclipse.passage</groupId>
-		<artifactId>org.eclipse.passage.parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
-		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
-	</parent>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<inherited>true</inherited>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<id>archive-repository</id>
-						<goals>
-							<goal>archive-repository</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${build.label}</finalName>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.lic.repository/category.xml b/releng/org.eclipse.passage.lic.repository/category.xml
deleted file mode 100644
index 2240c69b8..000000000
--- a/releng/org.eclipse.passage.lic.repository/category.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018, 2022 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<site>
-   <feature id="org.eclipse.passage.lic.compile.feature">
-      <category name="org.eclipse.passage.lic.category"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.execute.feature">
-      <category name="org.eclipse.passage.lic.category"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.define.feature">
-      <category name="org.eclipse.passage.lic.category"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.bc.feature">
-      <category name="org.eclipse.passage.lic.category"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.api.tests.feature">
-      <category name="org.eclipse.passage.lic.category"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.compile.feature.source">
-      <category name="org.eclipse.passage.lic.category.source"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.api.tests.feature.source">
-      <category name="org.eclipse.passage.lic.category.source"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.execute.feature.source">
-      <category name="org.eclipse.passage.lic.category.source"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.define.feature.source">
-      <category name="org.eclipse.passage.lic.category.source"/>
-   </feature>
-   <feature id="org.eclipse.passage.lic.bc.feature.source">
-      <category name="org.eclipse.passage.lic.category.source"/>
-   </feature>
-   <bundle id="bcpg"/>
-   <bundle id="bcpg.source"/>
-   <bundle id="bcpkix"/>
-   <bundle id="bcpkix.source"/>
-   <bundle id="bcprov"/>
-   <bundle id="bcprov.source"/>
-   <bundle id="bcutil"/>
-   <bundle id="bcutil.source"/>
-   <bundle id="com.github.oshi.oshi-core"/>
-   <bundle id="com.github.oshi.oshi-core.source"/>
-   <bundle id="com.sun.jna"/>
-   <bundle id="com.sun.jna.source"/>
-   <bundle id="com.sun.jna.platform"/>
-   <bundle id="com.sun.jna.platform.source"/>
-   <bundle id="slf4j.api"/>
-   <bundle id="slf4j.api.source"/>
-   <bundle id="slf4j.nop"/>
-   <bundle id="slf4j.nop.source"/>
-   <category-def name="org.eclipse.passage.lic.category" label="Passage LIC">
-      <description>
-         Passage Licensing Integration Components includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
-      </description>
-   </category-def>
-   <category-def name="org.eclipse.passage.lic.category.source" label="Passage LIC Developer Resources">
-      <description>
-         Passage Licensing Integration Components Developer Resources includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
-      </description>
-   </category-def>
-</site>
diff --git a/releng/org.eclipse.passage.lic.repository/pom.xml b/releng/org.eclipse.passage.lic.repository/pom.xml
deleted file mode 100644
index d2d8cdfe6..000000000
--- a/releng/org.eclipse.passage.lic.repository/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2018, 2024 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>org.eclipse.passage.lic.repository</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<parent>
-		<groupId>org.eclipse.passage</groupId>
-		<artifactId>org.eclipse.passage.parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
-		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<inherited>true</inherited>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<id>archive-repository</id>
-						<goals>
-							<goal>archive-repository</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${build.label}</finalName>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.releng/compositeArtifacts.xml b/releng/org.eclipse.passage.releng/compositeArtifacts.xml
deleted file mode 100644
index cc0ea6f1b..000000000
--- a/releng/org.eclipse.passage.releng/compositeArtifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<!--
-	Copyright (c) 2021 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<repository name='&quot;Eclipse Passage Composite Site&quot;'
-	type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository'
-	version='1.0.0'>
-	<properties size='1'>
-		<property name='p2.timestamp' value='1722355264603' />
-	</properties>
-	<children size='4'>
-		<child location='lic' />
-		<child location='loc' />
-		<child location='ldc' />
-		<child location='demo' />
-	</children>
-</repository>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.releng/compositeContent.xml b/releng/org.eclipse.passage.releng/compositeContent.xml
deleted file mode 100644
index 28e3a5c77..000000000
--- a/releng/org.eclipse.passage.releng/compositeContent.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<!--
-	Copyright (c) 2021 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<repository name='&quot;Eclipse Passage Composite Site&quot;'
-	type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository'
-	version='1.0.0'>
-	<properties size='1'>
-		<property name='p2.timestamp' value='1722355264603' />
-	</properties>
-	<children size='4'>
-		<child location='lic' />
-		<child location='loc' />
-		<child location='ldc' />
-		<child location='demo' />
-	</children>
-</repository>
\ No newline at end of file
diff --git a/sites/org.eclipse.passage.repository/category.xml b/sites/org.eclipse.passage.repository/category.xml
index 7236373f2..be8a9eff5 100644
--- a/sites/org.eclipse.passage.repository/category.xml
+++ b/sites/org.eclipse.passage.repository/category.xml
@@ -41,6 +41,12 @@
    <feature id="org.eclipse.passage.ldc.feature.source">
       <category name="org.eclipse.passage.ldc.category.source"/>
    </feature>
+   <feature id="org.eclipse.passage.demo.feature">
+      <category name="org.eclipse.passage.demo.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.demo.feature.source">
+      <category name="org.eclipse.passage.demo.category.source"/>
+   </feature>
    <bundle id="bcpg"/>
    <bundle id="bcpg.source"/>
    <bundle id="bcpkix"/>
@@ -81,4 +87,14 @@
     Eclipse PDE integration&quot;
       </description>
    </category-def>
+   <category-def name="org.eclipse.passage.demo.category" label="Passage Demo">
+      <description>
+         Eclipse Passage Demo contains final licensing runtime assembly
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.passage.demo.category.source" label="Passage Demo Developer Resources">
+      <description>
+         Eclipse Passage Demo  Developer Resources contains final licensing runtime assembly
+      </description>
+   </category-def>
 </site>
diff --git a/sites/org.eclipse.passage.repository/pom.xml b/sites/org.eclipse.passage.repository/pom.xml
index 2116f4144..54a1dbcbf 100644
--- a/sites/org.eclipse.passage.repository/pom.xml
+++ b/sites/org.eclipse.passage.repository/pom.xml
@@ -29,7 +29,7 @@
 	</parent>
 
 	<properties>
-		<eclipse.repo>https://download.eclipse.org/releases/2023-06</eclipse.repo>
+		<eclipse.repo>https://download.eclipse.org/releases/latest</eclipse.repo>
 		<justj.tools.repo>https://download.eclipse.org/justj/tools/updates/nightly/latest</justj.tools.repo>
 		<org.eclipse.storage.user>genie.passage</org.eclipse.storage.user>
 		<org.eclipse.justj.p2.manager.args>-remote ${org.eclipse.storage.user}@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/passage</org.eclipse.justj.p2.manager.args>