diff --git a/PWGHF/ALICE3/TableProducer/CMakeLists.txt b/PWGHF/ALICE3/TableProducer/CMakeLists.txt
index 5a5201102e3..5bbc40353ee 100644
--- a/PWGHF/ALICE3/TableProducer/CMakeLists.txt
+++ b/PWGHF/ALICE3/TableProducer/CMakeLists.txt
@@ -21,6 +21,11 @@ o2physics_add_dpl_workflow(candidate-creator-x
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(candidate-creator-xicc
+                    SOURCES candidateCreatorXicc.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
+                    COMPONENT_NAME Analysis)
+
 # Candidate selectors
 
 o2physics_add_dpl_workflow(candidate-selector-chic-to-jpsi-gamma
@@ -63,6 +68,11 @@ o2physics_add_dpl_workflow(candidate-selector-x-to-jpsi-pi-pi
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(candidate-selector-xicc-to-p-k-pi-pi
+                    SOURCES candidateSelectorXiccToPKPiPi.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
 # Tree creators
 
 o2physics_add_dpl_workflow(tree-creator-chic-to-jpsi-gamma
@@ -74,3 +84,8 @@ o2physics_add_dpl_workflow(tree-creator-x-to-jpsi-pi-pi
                     SOURCES treeCreatorXToJpsiPiPi.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(tree-creator-xicc-to-p-k-pi-pi
+                    SOURCES treeCreatorXiccToPKPiPi.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
diff --git a/PWGHF/TableProducer/candidateCreatorXicc.cxx b/PWGHF/ALICE3/TableProducer/candidateCreatorXicc.cxx
similarity index 100%
rename from PWGHF/TableProducer/candidateCreatorXicc.cxx
rename to PWGHF/ALICE3/TableProducer/candidateCreatorXicc.cxx
diff --git a/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorXiccToPKPiPi.cxx
similarity index 100%
rename from PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx
rename to PWGHF/ALICE3/TableProducer/candidateSelectorXiccToPKPiPi.cxx
diff --git a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx b/PWGHF/ALICE3/TableProducer/treeCreatorXiccToPKPiPi.cxx
similarity index 100%
rename from PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx
rename to PWGHF/ALICE3/TableProducer/treeCreatorXiccToPKPiPi.cxx
diff --git a/PWGHF/ALICE3/Tasks/CMakeLists.txt b/PWGHF/ALICE3/Tasks/CMakeLists.txt
index 140815e7585..c94c68a9587 100644
--- a/PWGHF/ALICE3/Tasks/CMakeLists.txt
+++ b/PWGHF/ALICE3/Tasks/CMakeLists.txt
@@ -53,3 +53,8 @@ o2physics_add_dpl_workflow(task-x
                     SOURCES taskX.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(task-xicc
+                    SOURCES taskXicc.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
diff --git a/PWGHF/D2H/Tasks/taskXicc.cxx b/PWGHF/ALICE3/Tasks/taskXicc.cxx
similarity index 100%
rename from PWGHF/D2H/Tasks/taskXicc.cxx
rename to PWGHF/ALICE3/Tasks/taskXicc.cxx
diff --git a/PWGHF/D2H/Tasks/CMakeLists.txt b/PWGHF/D2H/Tasks/CMakeLists.txt
index ada324b046a..40f2358fdaf 100644
--- a/PWGHF/D2H/Tasks/CMakeLists.txt
+++ b/PWGHF/D2H/Tasks/CMakeLists.txt
@@ -149,11 +149,6 @@ o2physics_add_dpl_workflow(task-xic-to-xi-pi-pi
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(task-xicc
-                    SOURCES taskXicc.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
-                    COMPONENT_NAME Analysis)
-
 o2physics_add_dpl_workflow(task-xic0-to-xi-pi
                     SOURCES taskXic0ToXiPi.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
diff --git a/PWGHF/TableProducer/CMakeLists.txt b/PWGHF/TableProducer/CMakeLists.txt
index 26b3400ca28..8103e914d1e 100644
--- a/PWGHF/TableProducer/CMakeLists.txt
+++ b/PWGHF/TableProducer/CMakeLists.txt
@@ -95,11 +95,6 @@ o2physics_add_dpl_workflow(candidate-creator-xic-to-xi-pi-pi
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
                     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(candidate-creator-xicc
-                    SOURCES candidateCreatorXicc.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
-                    COMPONENT_NAME Analysis)
-
 o2physics_add_dpl_workflow(candidate-creator-mc-gen
                     SOURCES candidateCreatorMcGen.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
@@ -197,12 +192,7 @@ o2physics_add_dpl_workflow(candidate-selector-xic-to-xi-pi-pi
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore
                     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(candidate-selector-xicc-to-p-k-pi-pi
-                    SOURCES candidateSelectorXiccToPKPiPi.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
-                    COMPONENT_NAME Analysis)
-
- o2physics_add_dpl_workflow(candidate-selector-cd
+o2physics_add_dpl_workflow(candidate-selector-cd
                      SOURCES candidateSelectorCd.cxx
                      PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                      COMPONENT_NAME Analysis)
@@ -239,6 +229,11 @@ o2physics_add_dpl_workflow(tree-creator-ds-to-k-k-pi
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(tree-creator-dstar-to-d0-pi
+                    SOURCES treeCreatorDstarToD0Pi.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(tree-creator-lb-to-lc-pi
                     SOURCES treeCreatorLbToLcPi.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
@@ -294,16 +289,6 @@ o2physics_add_dpl_workflow(tree-creator-xic-to-xi-pi-pi
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(tree-creator-xicc-to-p-k-pi-pi
-                    SOURCES treeCreatorXiccToPKPiPi.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(tree-creator-dstar-to-d0-pi
-                    SOURCES treeCreatorDstarToD0Pi.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
-                    COMPONENT_NAME Analysis)
-
 o2physics_add_dpl_workflow(tree-creator-tcc-to-d0-d0-pi
                     SOURCES treeCreatorTccToD0D0Pi.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore