diff --git a/pipelines/LSSTCam/DRP.yaml b/pipelines/LSSTCam/DRP.yaml
index d87a0a95..1f77d123 100644
--- a/pipelines/LSSTCam/DRP.yaml
+++ b/pipelines/LSSTCam/DRP.yaml
@@ -79,7 +79,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection
diff --git a/pipelines/LSSTCam/nightly-validation.yaml b/pipelines/LSSTCam/nightly-validation.yaml
index c6954902..a470c83c 100644
--- a/pipelines/LSSTCam/nightly-validation.yaml
+++ b/pipelines/LSSTCam/nightly-validation.yaml
@@ -101,7 +101,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection
diff --git a/pipelines/LSSTComCam/DRP.yaml b/pipelines/LSSTComCam/DRP.yaml
index c0b4dde3..7ef5b5e3 100644
--- a/pipelines/LSSTComCam/DRP.yaml
+++ b/pipelines/LSSTComCam/DRP.yaml
@@ -79,7 +79,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection
diff --git a/pipelines/LSSTComCam/nightly-validation.yaml b/pipelines/LSSTComCam/nightly-validation.yaml
index 73e28923..3a4d67ec 100644
--- a/pipelines/LSSTComCam/nightly-validation.yaml
+++ b/pipelines/LSSTComCam/nightly-validation.yaml
@@ -101,7 +101,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection
diff --git a/pipelines/LSSTComCamSim/nightly-validation.yaml b/pipelines/LSSTComCamSim/nightly-validation.yaml
index 86841da7..763a1104 100644
--- a/pipelines/LSSTComCamSim/nightly-validation.yaml
+++ b/pipelines/LSSTComCamSim/nightly-validation.yaml
@@ -101,7 +101,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection