diff --git a/src/fmripost_aroma/workflows/base.py b/src/fmripost_aroma/workflows/base.py
index 94871ee..d56c0f6 100644
--- a/src/fmripost_aroma/workflows/base.py
+++ b/src/fmripost_aroma/workflows/base.py
@@ -173,6 +173,8 @@ def init_single_subject_wf(subject_id: str):
 ### References
 
 """
+    entities = config.execution.bids_filters.copy()
+    entities['subject'] = subject_id
 
     if config.execution.derivatives:
         # Raw dataset + derivatives dataset
@@ -180,7 +182,7 @@ def init_single_subject_wf(subject_id: str):
         subject_data = collect_derivatives(
             raw_dataset=config.execution.layout,
             derivatives_dataset=None,
-            entities=config.execution.bids_filters,
+            entities=entities,
             fieldmap_id=None,
             allow_multiple=True,
             spaces=None,
@@ -192,7 +194,7 @@ def init_single_subject_wf(subject_id: str):
         subject_data = collect_derivatives(
             raw_dataset=None,
             derivatives_dataset=config.execution.layout,
-            entities=config.execution.bids_filters,
+            entities=entities,
             fieldmap_id=None,
             allow_multiple=True,
             spaces=None,