diff --git a/releng/org.eclipse.passage.releng/passage-configuration.setup b/releng/org.eclipse.passage.releng/passage-configuration.setup
index 386ad40b3..272b23992 100644
--- a/releng/org.eclipse.passage.releng/passage-configuration.setup
+++ b/releng/org.eclipse.passage.releng/passage-configuration.setup
@@ -13,7 +13,7 @@
     </detail>
     <detail
         key="imageURI">
-      <value>https://raw.githubusercontent.com/eclipse-passage/passage/master/products/org.eclipse.passage.loc.operator.product/ico/48.png</value>
+      <value>https://raw.githubusercontent.com/eclipse-passage/passage/master/bundles/org.eclipse.passage.lic.execute.branding/passage32.png</value>
     </detail>
   </annotation>
   <installation
diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
index 6b06ee554..d454daed9 100644
--- a/releng/org.eclipse.passage.releng/passage.setup
+++ b/releng/org.eclipse.passage.releng/passage.setup
@@ -23,7 +23,7 @@
     </detail>
     <detail
         key="imageURI">
-      <value>https://raw.githubusercontent.com/eclipse-passage/passage/master/products/org.eclipse.passage.loc.operator.product/ico/48.png</value>
+      <value>https://raw.githubusercontent.com/eclipse-passage/passage/master/bundles/org.eclipse.passage.lic.execute.branding/passage32.png</value>
     </detail>
   </annotation>
   <annotation
@@ -138,7 +138,7 @@
           name="${scope.project.label}">
         <predicate
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LDC'] //@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LIC'] //@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LOC']"/>
+            excludedWorkingSet="//@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LDC'] //@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LIC']"/>
       </workingSet>
       <workingSet
           name="${scope.project.label} LIC">
@@ -146,12 +146,6 @@
             xsi:type="predicates:NamePredicate"
             pattern=".*\.lic\..*"/>
       </workingSet>
-      <workingSet
-          name="${scope.project.label} LOC">
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern=".*\.loc\..*"/>
-      </workingSet>
       <workingSet
           name="${scope.project.label} LDC">
         <predicate
diff --git a/sites/org.eclipse.passage.repository/category.xml b/sites/org.eclipse.passage.repository/category.xml
index f39cdb753..00dfe492f 100644
--- a/sites/org.eclipse.passage.repository/category.xml
+++ b/sites/org.eclipse.passage.repository/category.xml
@@ -11,145 +11,92 @@
      ArSysOp - initial API and implementation
 -->
 <site>
-	<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>
-	<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.jetty.feature">
-		<category name="org.eclipse.passage.lic.category" />
-	</feature>
-
-	<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>
-	<feature
-		id="org.eclipse.passage.lic.compile.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>
-	<feature
-		id="org.eclipse.passage.lic.jetty.feature.source">
-		<category name="org.eclipse.passage.lic.category.source" />
-	</feature>
-	<category-def
-		name="org.eclipse.passage.ldc.category"
-		label="Passage LDC">
-		<description>
-			Passage Licensing Definition Components: 
-				Eclipse PDE integration" 
-		</description>
-	</category-def>
-	<feature 
-		id="org.eclipse.passage.ldc.feature">
-		<category name="org.eclipse.passage.ldc.category" />
-	</feature>
-	<category-def
-		name="org.eclipse.passage.ldc.category.source"
-		label="Passage LDC Developer Resources">
-		<description>
-			Passage Licensing Definition Components Developer Resources: 
-				Eclipse PDE integration" 
-		</description>
-	</category-def>
-	<feature 
-		id="org.eclipse.passage.ldc.feature.source">
-		<category name="org.eclipse.passage.ldc.category.source" />
-	</feature>
-	<category-def
-		name="org.eclipse.passage.loc.category"
-		label="Passage LOC">
-		<description>
-			Passage Licensing Operator Components includes: Dashboard, EMF Forms editors, operator services
-		</description>
-	</category-def>
-	<feature
-		id="org.eclipse.passage.loc.dashboard.feature">
-		<category name="org.eclipse.passage.loc.category" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.loc.operator.feature">
-		<category name="org.eclipse.passage.loc.category" />
-	</feature>
-	<category-def
-		name="org.eclipse.passage.loc.category.source"
-		label="Passage LOC Developer Resources">
-		<description>
-			Passage Licensing Operator Components Developer Resources includes: Dashboard, EMF Forms editors, operator services
-		</description>
-	</category-def>
-	<feature
-		id="org.eclipse.passage.loc.dashboard.feature.source">
-		<category name="org.eclipse.passage.loc.category.source" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.loc.operator.feature.source">
-		<category name="org.eclipse.passage.loc.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.fasterxml.jackson.core.jackson-annotations"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-core"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-databind.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="jakarta.activation-api" />
-	<bundle id="jakarta.activation-api.source" />
-	<bundle id="jakarta.annotation-api" />
-	<bundle id="jakarta.annotation-api.source" />
-	<bundle id="jakarta.servlet-api" />
-	<bundle id="jakarta.servlet-api.source" />
-	<bundle id="slf4j.api" />
-	<bundle id="slf4j.api.source" />
-	<bundle id="slf4j.nop" />
-	<bundle id="slf4j.nop.source" />
+   <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.jetty.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.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>
+   <feature id="org.eclipse.passage.lic.jetty.feature.source">
+      <category name="org.eclipse.passage.lic.category.source"/>
+   </feature>
+   <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.fasterxml.jackson.core.jackson-annotations"/>
+   <bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
+   <bundle id="com.fasterxml.jackson.core.jackson-core"/>
+   <bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
+   <bundle id="com.fasterxml.jackson.core.jackson-databind"/>
+   <bundle id="com.fasterxml.jackson.core.jackson-databind.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="jakarta.activation-api"/>
+   <bundle id="jakarta.activation-api.source"/>
+   <bundle id="jakarta.annotation-api"/>
+   <bundle id="jakarta.annotation-api.source"/>
+   <bundle id="jakarta.servlet-api"/>
+   <bundle id="jakarta.servlet-api.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>
+   <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>