diff --git a/codeHF/config_input.sh b/codeHF/config_input.sh
index 1a2bf8ac..faf505df 100644
--- a/codeHF/config_input.sh
+++ b/codeHF/config_input.sh
@@ -88,7 +88,7 @@ case $INPUT_CASE in
     ISMC=1;;
   12)
     INPUT_LABEL="Run 5, p-p MC 14 TeV OniaX-enriched, Scenario 3, oniaX analysis MUON ID"
-    INPUT_DIR="/home/auras/simulations/delphes/ONIA_X"
+    INPUT_DIR="/home/auras/simulations/delphes/ONIA_X/run_002"
     INPUT_FILES="AODRun5.*.root"
     JSON="$JSONRUN5_ONIAX"
     ISINPUTO2=1
diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh
index a1056e9a..cde64a5e 100644
--- a/codeHF/config_tasks.sh
+++ b/codeHF/config_tasks.sh
@@ -46,7 +46,7 @@ DOO2_SEL_D0=0       # hf-d0-candidate-selector
 DOO2_SEL_DPLUS=0    # hf-dplus-topikpi-candidate-selector
 DOO2_SEL_LC=0       # hf-lc-candidate-selector
 DOO2_SEL_XIC=0      # hf-xic-topkpi-candidate-selector
-DOO2_SEL_JPSI=0     # hf-jpsi-toee-candidate-selector
+DOO2_SEL_JPSI=0     # hf-jpsi-candidate-selector
 DOO2_SEL_X=0        # hf-xic-topkpi-candidate-selector
 # User tasks
 DOO2_TASK_D0=1      # hf-task-d0
@@ -149,7 +149,7 @@ function MakeScriptO2 {
   [ $DOO2_PID_TOF -eq 1 ] && WORKFLOWS+=" o2-analysis-pid-tof-full"
   [ $DOO2_PID_TOF_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-pid-tof-qa-mc"
   [ $DOO2_SEL_D0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-d0-candidate-selector"
-  [ $DOO2_SEL_JPSI -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-jpsi-toee-candidate-selector"
+  [ $DOO2_SEL_JPSI -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-jpsi-candidate-selector"
   [ $DOO2_SEL_DPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-dplus-topikpi-candidate-selector"
   [ $DOO2_SEL_LC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-lc-candidate-selector"
   [ $DOO2_SEL_XIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-xic-topkpi-candidate-selector"
diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json
index fbc12134..1bd0895e 100644
--- a/codeHF/dpl-config_run3.json
+++ b/codeHF/dpl-config_run3.json
@@ -248,7 +248,7 @@
         "d_nSigmaTOF": "3.",
         "d_nSigmaTOFCombined": "5."
     },
-    "hf-jpsi-toee-candidate-selector": {
+    "hf-jpsi-candidate-selector": {
         "d_pTCandMin": "0.",
         "d_pTCandMax": "50.",
         "d_pidTPCMinpT": "0.15",
diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json
index 77d75a3f..d88c0335 100644
--- a/codeHF/dpl-config_run5_hf.json
+++ b/codeHF/dpl-config_run5_hf.json
@@ -248,7 +248,7 @@
         "d_nSigmaTOF": "3.",
         "d_nSigmaTOFCombined": "5."
     },
-    "hf-jpsi-toee-candidate-selector": {
+    "hf-jpsi-candidate-selector": {
         "d_pTCandMin": "0.",
         "d_pTCandMax": "50.",
         "d_pidTPCMinpT": "1000.",
diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json
index e17f0d95..acd7a183 100644
--- a/codeHF/dpl-config_run5_oniaX.json
+++ b/codeHF/dpl-config_run5_oniaX.json
@@ -248,7 +248,8 @@
         "d_nSigmaTOF": "3.",
         "d_nSigmaTOFCombined": "5."
     },
-    "hf-jpsi-toee-candidate-selector": {
+    "hf-jpsi-candidate-selector": {
+        "isALICE3": "true",
         "d_pTCandMin": "0.",
         "d_pTCandMax": "50.",
         "d_pidTPCMinpT": "1000.",
diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml
index 418811f1..adfe76da 100644
--- a/codeHF/workflows.yml
+++ b/codeHF/workflows.yml
@@ -34,9 +34,10 @@ workflows:
     activate: no
     dependencies: [o2-analysis-hf-candidate-creator-2prong, o2-analysis-pid-tpc-full, o2-analysis-pid-tof-full]
 
-  o2-analysis-hf-jpsi-toee-candidate-selector:
+  o2-analysis-hf-jpsi-candidate-selector:
     <<: *selector_2prong
     activate: no
+    tables: HFSELJPSICAND
 
   o2-analysis-hf-dplus-topikpi-candidate-selector: &selector_3prong
     activate: no
@@ -54,7 +55,7 @@ workflows:
 
   o2-analysis-hf-candidate-creator-x: &cand_creator_casc
     activate: no
-    dependencies: [o2-analysis-hf-jpsi-toee-candidate-selector]
+    dependencies: [o2-analysis-hf-jpsi-candidate-selector]
     options:
       mc: "--doMC"
     tables:
@@ -78,7 +79,7 @@ workflows:
   o2-analysis-hf-task-jpsi:
     <<: *task
     activate: no
-    dependencies: o2-analysis-hf-jpsi-toee-candidate-selector
+    dependencies: o2-analysis-hf-jpsi-candidate-selector
 
   o2-analysis-hf-task-dplus:
     <<: *task