diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.properties b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.properties
new file mode 100755
index 0000000..8d1e033
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.properties
@@ -0,0 +1,36 @@
+###############################################################################
+#  Copyright (c) 2017 CEA LIST.
+#
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License 2.0
+#  which accompanies this distribution, and is available at
+#  https://www.eclipse.org/legal/epl-2.0/
+#
+#  SPDX-License-Identifier: EPL-2.0
+#
+#  Contributors:
+#  		CEA LIST - Initial API and implementation
+###############################################################################
+# NLS_MESSAGEFORMAT_VAR
+
+# "featureName" property - name of the feature
+featureName=Papyrus CDO Server
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Modeling Project 
+
+# description property - text of the "Feature Description"
+description=Feature providing a Papyrus CDO server using H2 database.
+################ end of description property ##################################
+
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2018 CEA LIST.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml
index 50196ff..9e70379 100644
--- a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.cdo.server.feature"
-      label="Papyrus CDO Server"
+      label="%featureName"
       version="1.0.0.qualifier"
-      provider-name="Eclipse Modeling Project">
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="2.0.2">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="https://eclipse.org/papyrus/">
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      %copyright
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="%licenseURL">
+      %license
    </license>
 
    <plugin
diff --git a/cdo-server/pom.xml b/cdo-server/pom.xml
index 9ff3de4..e68d660 100644
--- a/cdo-server/pom.xml
+++ b/cdo-server/pom.xml
@@ -64,6 +64,14 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+	<repositories>
+		<repository>
+			<id>license-feature</id>
+			<url>http://download.eclipse.org/cbi/updates/license/</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+	
 	<build>
 		<outputDirectory>bin</outputDirectory>
 		<pluginManagement>
diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
index 43894ca..df32489 100644
--- a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Server" sequenceNumber="1620304894">
+<target name="Papyrus CDO Server" sequenceNumber="1630681147">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
       <unit id="javax.xml" version="0.0.0"/>
-      <repository id="eclipse-latest" location="http://download.eclipse.org/releases/latest/"/>
+      <repository id="eclipse" location="https://download.eclipse.org/releases/2021-06/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+      <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20210826-0457"/>
     </location>
   </locations>
 </target>
diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
index 498c606..eaf4cb3 100644
--- a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
@@ -1,9 +1,12 @@
 target "Papyrus CDO Server" with source requirements
 
-location "http://download.eclipse.org/releases/latest/" eclipse-latest {
+location "https://download.eclipse.org/releases/2021-06/" eclipse {
 	org.eclipse.rcp.feature.group lazy
 	org.eclipse.equinox.executable.feature.group lazy
 	org.eclipse.equinox.p2.discovery.feature.feature.group lazy
-	org.eclipse.emf.cdo.sdk.feature.group lazy
 	javax.xml lazy
 }
+
+location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20210826-0457"{
+	org.eclipse.emf.cdo.sdk.feature.group lazy
+}
\ No newline at end of file
diff --git a/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml b/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
index a9633f3..8d23361 100755
--- a/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
+++ b/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
@@ -21,7 +21,7 @@
       license-feature-version="2.0.2">
 
    <description url="https://eclipse.org/papyrus/">
-      %decription
+      %description
    </description>
 
    <copyright>