diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ClaimedTaskIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ClaimedTaskIndexFactoryImpl.java
index 411aa6a0fb..81c9c613c2 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ClaimedTaskIndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ClaimedTaskIndexFactoryImpl.java
@@ -17,10 +17,14 @@ import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.common.SolrInputDocument;
 import org.dspace.core.Context;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.indexobject.factory.ClaimedTaskIndexFactory;
+import org.dspace.discovery.indexobject.factory.ItemIndexFactory;
 import org.dspace.discovery.indexobject.factory.WorkflowItemIndexFactory;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.xmlworkflow.storedcomponents.ClaimedTask;
+import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.dspace.xmlworkflow.storedcomponents.service.ClaimedTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -36,6 +40,9 @@ public class ClaimedTaskIndexFactoryImpl extends IndexFactoryImpl<IndexableClaim
     @Autowired
     WorkflowItemIndexFactory indexableWorkflowItemService;
 
+    @Autowired
+    protected ItemIndexFactory indexableItemService;
+
     @Override
     public Iterator<IndexableClaimedTask> findAll(Context context) throws SQLException {
         final Iterator<ClaimedTask> claimedTasks = claimedTaskService.findAll(context).iterator();
@@ -77,6 +84,12 @@ public class ClaimedTaskIndexFactoryImpl extends IndexFactoryImpl<IndexableClaim
             acvalue = indexableObject.getTypeText();
         }
         addNamedResourceTypeIndex(doc, acvalue);
+        final XmlWorkflowItem xmlWorkflowItem = indexableObject.getIndexedObject().getWorkflowItem();
+
+        // Add the item metadata as configured
+        List<DiscoveryConfiguration> discoveryConfigurations = SearchUtils
+                                                     .getAllDiscoveryConfigurations(xmlWorkflowItem);
+        indexableItemService.addDiscoveryFields(doc, context, xmlWorkflowItem.getItem(), discoveryConfigurations);
 
         return doc;
     }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/PoolTaskIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/PoolTaskIndexFactoryImpl.java
index e7f2f0a14c..971236da12 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/PoolTaskIndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/PoolTaskIndexFactoryImpl.java
@@ -17,10 +17,14 @@ import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.common.SolrInputDocument;
 import org.dspace.core.Context;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.discovery.configuration.DiscoveryConfiguration;
+import org.dspace.discovery.indexobject.factory.ItemIndexFactory;
 import org.dspace.discovery.indexobject.factory.PoolTaskIndexFactory;
 import org.dspace.discovery.indexobject.factory.WorkflowItemIndexFactory;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.xmlworkflow.storedcomponents.PoolTask;
+import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.dspace.xmlworkflow.storedcomponents.service.PoolTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -37,6 +41,9 @@ public class PoolTaskIndexFactoryImpl extends IndexFactoryImpl<IndexablePoolTask
     @Autowired
     WorkflowItemIndexFactory indexableWorkflowItemService;
 
+    @Autowired
+    protected ItemIndexFactory indexableItemService;
+
     @Override
     public Iterator<IndexablePoolTask> findAll(Context context) throws SQLException {
         final Iterator<PoolTask> pooledTasks = poolTaskService.findAll(context).iterator();
@@ -82,6 +89,12 @@ public class PoolTaskIndexFactoryImpl extends IndexFactoryImpl<IndexablePoolTask
             acvalue = indexableObject.getTypeText();
         }
         addNamedResourceTypeIndex(doc, acvalue);
+        final XmlWorkflowItem xmlWorkflowItem = indexableObject.getIndexedObject().getWorkflowItem();
+
+        // Add the item metadata as configured
+        List<DiscoveryConfiguration> discoveryConfigurations = SearchUtils
+                                                     .getAllDiscoveryConfigurations(xmlWorkflowItem);
+        indexableItemService.addDiscoveryFields(doc, context, xmlWorkflowItem.getItem(), discoveryConfigurations);
 
         return doc;
     }