diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml
index 381e42b6..ae217ee8 100644
--- a/pipelines/HSC/DRP-RC2.yaml
+++ b/pipelines/HSC/DRP-RC2.yaml
@@ -187,6 +187,7 @@ subsets:
       - plotPropertyMapTract
       - refCatObjectTract
       - validateObjectTableCore
+      - objectEpochTable
     description: |
       Tasks that can be run together, but only after the 'step1' and 'step2'
       subsets.
diff --git a/pipelines/HSC/DRP-RC2_subset.yaml b/pipelines/HSC/DRP-RC2_subset.yaml
index 00c29540..403f0db6 100644
--- a/pipelines/HSC/DRP-RC2_subset.yaml
+++ b/pipelines/HSC/DRP-RC2_subset.yaml
@@ -380,6 +380,7 @@ subsets:
       - psfPhotRepStar2
       - psfPhotRepStar3
       - psfPhotRepStar4
+      - objectEpochTable
     description: |
       Tasks that can be run together, but only after the 'step1' and 'step2'
       subsets.
diff --git a/pipelines/HSC/DRP-ci_hsc.yaml b/pipelines/HSC/DRP-ci_hsc.yaml
index 6d7405eb..a70e7813 100644
--- a/pipelines/HSC/DRP-ci_hsc.yaml
+++ b/pipelines/HSC/DRP-ci_hsc.yaml
@@ -64,6 +64,24 @@ tasks:
       atools.wholeSkyMetric.bands: ["r", "i"]
       python: |
         from lsst.analysis.tools.atools import *
+  analyzeMatchedVisitCore:
+    class: lsst.analysis.tools.tasks.AssociatedSourcesTractAnalysisTask
+    config:
+      # gbdesAstrometricFit is not run on ci_hsc, so there is no proper motion
+      # and parallax catalog available to use here.
+      applyAstrometricCorrections: false
+  analyzeMatchedVisitExtended:
+    class: lsst.analysis.tools.tasks.AssociatedSourcesTractAnalysisTask
+    config:
+      # gbdesAstrometricFit is not run on ci_hsc, so there is no proper motion
+      # and parallax catalog available to use here.
+      applyAstrometricCorrections: false
+  sourceObjectMatch:
+    class: lsst.analysis.tools.tasks.SourceObjectTableAnalysisTask
+    config:
+      # gbdesAstrometricFit is not run on ci_hsc, so there is no proper motion
+      # and parallax catalog available to use here.
+      applyAstrometricCorrections: false
 
 subsets:
   analysis_tools:
diff --git a/pipelines/LSSTCam/DRP.yaml b/pipelines/LSSTCam/DRP.yaml
index 1f77d123..bffa9725 100644
--- a/pipelines/LSSTCam/DRP.yaml
+++ b/pipelines/LSSTCam/DRP.yaml
@@ -104,6 +104,7 @@ subsets:
       - plotPropertyMapTract
       - refCatObjectTract
       - validateObjectTableCore
+      - objectEpochTable
     description: |
       Tasks that can be run together, but only after the 'step1' and 'step2d'
       subsets.
@@ -152,6 +153,7 @@ subsets:
   step6:
     subset:
       - consolidateDiaSourceTable
+      - sourceObjectMatch
     description: |
       Tasks that can be run together, but only after the 'step1', 'step2',
       'step3', and 'step4' subsets
diff --git a/pipelines/LSSTComCam/DRP.yaml b/pipelines/LSSTComCam/DRP.yaml
index 7ef5b5e3..816ff8e4 100644
--- a/pipelines/LSSTComCam/DRP.yaml
+++ b/pipelines/LSSTComCam/DRP.yaml
@@ -104,6 +104,7 @@ subsets:
       - plotPropertyMapTract
       - refCatObjectTract
       - validateObjectTableCore
+      - objectEpochTable
     description: |
       Tasks that can be run together, but only after the 'step1' and 'step2d'
       subsets.
@@ -152,6 +153,7 @@ subsets:
   step6:
     subset:
       - consolidateDiaSourceTable
+      - sourceObjectMatch
     description: |
       Tasks that can be run together, but only after the 'step1', 'step2',
       'step3', and 'step4' subsets