diff --git a/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml b/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
index bd89e96..feaf74d 100755
--- a/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
+++ b/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
@@ -22,5 +22,5 @@
          This category provides the CDO&apos;ified version of metamodels (UML, CSS, style, ...), in order to get the best perfomance with CDO.
       </description>
    </category-def>
-   <repository-reference location="https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/modeling/emf/cdo/drops/R20210826-0457" enabled="true" />
 </site>
diff --git a/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml b/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
index 326219a..7560192 100755
--- a/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
+++ b/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
@@ -12,6 +12,17 @@
 	<artifactId>org.eclipse.papyrus.cdo.p2</artifactId>
 	<packaging>eclipse-repository</packaging>
 	
+	<properties>
+		<jboss.utils.version>1.7.0</jboss.utils.version>
+	</properties>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>org.jboss.tools.tycho-plugins</id>
+			<url>https://repository.jboss.org/</url>
+		</pluginRepository>
+	</pluginRepositories>
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -22,6 +33,38 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includePackedArtifacts>true</includePackedArtifacts>
+				</configuration>
+			</plugin>
+
+			<!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
+			<plugin>
+				<groupId>org.jboss.tools.tycho-plugins</groupId>
+				<artifactId>repository-utils</artifactId>
+				<version>${jboss.utils.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>generate-repository-facade</goal>
+						</goals>
+						<configuration>
+							<!-- do not generate the pesky web folder and index.html -->
+							<skipWebContentGeneration>true</skipWebContentGeneration>
+							<!-- p2 update site transitive dependencies repositories -->
+							<associateSites>
+								<!-- CDO update site  -->
+								<site>https://download.eclipse.org/modeling/emf/cdo/drops/R20210826-0457</site>
+							</associateSites>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file