diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/plugin.properties b/examples/org.eclipse.ocl.examples.project.completeocltutorial/plugin.properties
index 9e104e9..d9ae5b4 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/plugin.properties
@@ -9,5 +9,5 @@
 #	E.D.Willink - initial API and implementation
 ###############################################################################
 
-pluginName = OCLComplete OCL tutorial example
+pluginName = OCL Complete OCL tutorial example
 providerName = Eclipse OCL
diff --git a/releng/org.eclipse.ocl.releng.promote/pom.xml b/releng/org.eclipse.ocl.releng.promote/pom.xml
index 409ddeb..d19470a 100644
--- a/releng/org.eclipse.ocl.releng.promote/pom.xml
+++ b/releng/org.eclipse.ocl.releng.promote/pom.xml
@@ -88,7 +88,8 @@
                               -build-url ${org.eclipse.justj.p2.manager.build.url}
                               -root ${BUILD_ROOT}
                               -relative builds
-                              -version-iu org.eclipse.ocl.examples.feature.group
+                              -version-iu-pattern org\.eclipse\.ocl\.master\.feature.*
+                              -primary-iu-filter-pattern org\.eclipse\.ocl\.master\.feature.*|org\.eclipse\.ocl\.examples\.classic\.feature.*|org\.eclipse\.ocl\.examples\.unified\.feature.*
                               ${BUILD_COMMIT}
                               -target-url https://download.eclipse.org/modeling/mdt/ocl
                               -promote ${BUILD_PROMOTE}
@@ -96,6 +97,8 @@
                               -type ${BUILD_TYPE}
                               -breadcrumb "OCL https://projects.eclipse.org/projects/modeling.mdt.ocl"
                               -mapping ocl->OCL
+                              -archive "P2 repos https://archive.eclipse.org/modeling/mdt/ocl/updates/releases"
+                              -archive "zips/drops https://archive.eclipse.org/modeling/mdt/ocl/downloads/drops"
                               ${org.eclipse.justj.p2.manager.extra.args}
 							</appArgLine>
 						</configuration>
diff --git a/releng/org.eclipse.ocl.releng.tycho/.launches/JustJ for OCL.launch b/releng/org.eclipse.ocl.releng.tycho/.launches/JustJ for OCL.launch
index 5fc3128..3148a96 100644
--- a/releng/org.eclipse.ocl.releng.tycho/.launches/JustJ for OCL.launch
+++ b/releng/org.eclipse.ocl.releng.tycho/.launches/JustJ for OCL.launch
@@ -19,7 +19,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog&#13;&#10;-retain 50&#13;&#10;-label OCL&#13;&#10;-build-url https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/&#13;&#10;-root C:/Temp/ocl-sync -relative builds&#13;&#10;-version-iu org.eclipse.ocl.all.sdk.feature.group&#13;&#10;-target-url https://download.eclipse.org/modeling/mdt/ocl&#13;&#10;-promote E:\GIT\org.eclipse.ocl\releng\org.eclipse.ocl.releng.promote/../org.eclipse.ocl.releng.build-site/target/repository&#13;&#10;-type milestone&#13;&#10;-breadcrumb OCL https://projects.eclipse.org/projects/modeling.modeling.mdt.ocl/downloads"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog&#13;&#10;-retain 50&#13;&#10;-label OCL&#13;&#10;-build-url https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/&#13;&#10;-root C:/Temp/ocl-sync -relative builds&#13;&#10;                              -version-iu-pattern org\.eclipse\.ocl\.master\.feature.*&#13;&#10;                              -primary-iu-filter-pattern org\.eclipse\.ocl\.master\.feature.*|org\.eclipse\.ocl\.examples\.classic\.feature.*|org\.eclipse\.ocl\.examples\.unified\.feature.*&#13;&#10;\.classic\.feature.*|org\.eclipse\.ocl\.examples\.unified\.feature.*&#13;&#10;\.master\.feature.*|org\.eclipse\.ocl\.examples\.unified\.feature.*&#13;&#10;-target-url https://download.eclipse.org/modeling/mdt/ocl&#13;&#10;-promote E:\GIT\org.eclipse.ocl\releng\org.eclipse.ocl.releng.promote/../org.eclipse.ocl.releng.build-site/target/repository&#13;&#10;-type milestone&#13;&#10;-breadcrumb OCL https://projects.eclipse.org/projects/modeling.modeling.mdt.ocl/downloads&#13;&#10;                              -archive &quot;P2 repos https://archive.eclipse.org/modeling/mdt/ocl/updates/releases&quot;&#13;&#10;                              -archive &quot;zips/drops https://archive.eclipse.org/modeling/mdt/ocl/downloads/drops&quot;"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true"/>
     <stringAttribute key="pde.version" value="3.3"/>