diff --git a/codeJE/config_tasks.sh b/codeJE/config_tasks.sh
index dab180d1..28c11e5b 100644
--- a/codeJE/config_tasks.sh
+++ b/codeJE/config_tasks.sh
@@ -36,7 +36,7 @@ MAKE_GRAPH=0        # Make topology graph.
 # Activation of O2 workflows
 # Table producers
 DOO2_JET_DERIVED=0  # je-jet-deriveddata-producer
-DOO2_JET_FINDER=0   # je-jet-finder
+DOO2_JET_FINDER=0   # je-jet-finder-data-charged
 # Analysis tasks
 # TODO: Add analysis tasks
 # QA
@@ -143,7 +143,7 @@ function MakeScriptO2 {
   WORKFLOWS=""
   # Table producers
   [ $DOO2_JET_DERIVED -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-deriveddata-producer"
-  [ $DOO2_JET_FINDER -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder"
+  [ $DOO2_JET_FINDER -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-data-charged"
   # Analysis tasks
   # TODO: Add analysis tasks
   # QA
diff --git a/codeJE/dpl-config.json b/codeJE/dpl-config.json
index 04a6198b..b0fc5b88 100644
--- a/codeJE/dpl-config.json
+++ b/codeJE/dpl-config.json
@@ -56,14 +56,17 @@
         "etaMax": "0.8"
     },
     "jet-deriveddata-producer": {
-        "processBunchCossings": "true",
-        "processCollisions": "true",
+        "processBunchCrossings": "false",
+        "processCollisions": "false",
+        "processCollisionsWithoutCentralityAndMultiplicity": "true",
         "processMcCollisionLabels": "false",
         "processMcCollisions": "false",
         "processTracks": "true",
         "processMcTrackLabels": "false",
         "processParticles": "false",
-        "processClusters": "false"
+        "processClusters": "false",
+        "processD0": "false",
+        "processD0MC": "false"
     },
     "jet-finder-data-charged": {
         "vertexZCut": "10",
@@ -107,342 +110,6 @@
         "processParticleLevelNeutralJets": "false",
         "processParticleLevelFullJets": "false"
     },
-    "jet-finder-data-full": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel7",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-data-neutral": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-mcd-charged": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-mcd-full": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-mcd-neutral": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-mcp-charged": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-mcp-full": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
-    "jet-finder-mcp-neutral": {
-        "vertexZCut": "10",
-        "trackPtMin": "0.15",
-        "trackPtMax": "1000",
-        "trackEtaMin": "-0.8",
-        "trackEtaMax": "0.8",
-        "trackPhiMin": "-999",
-        "trackPhiMax": "999",
-        "trackSelections": "globalTracks",
-        "eventSelections": "sel8",
-        "particleSelections": "PhysicalPrimary",
-        "clusterDefinition": "kV3Default",
-        "clusterEtaMin": "-0.7",
-        "clusterEtaMax": "0.7",
-        "clusterPhiMin": "-999",
-        "clusterPhiMax": "999",
-        "clusterEnergyMin": "0.5",
-        "clusterTimeMin": "-999",
-        "clusterTimeMax": "999",
-        "clusterRejectExotics": "true",
-        "jetRadius": {
-            "values": [
-                "0.4"
-            ]
-        },
-        "jetPtMin": "0",
-        "jetPtMax": "1000",
-        "jetEtaMin": "-99",
-        "jetEtaMax": "99",
-        "jetAlgorithm": "2",
-        "jetRecombScheme": "0",
-        "jetGhostArea": "0.005",
-        "ghostRepeat": "1",
-        "DoTriggering": "false",
-        "processDummy": "true",
-        "processChargedJets": "false",
-        "processNeutralJets": "false",
-        "processFullJets": "false",
-        "processParticleLevelChargedJets": "false",
-        "processParticleLevelNeutralJets": "false",
-        "processParticleLevelFullJets": "false"
-    },
     "jet-validation-track-collision-qa": {
         "ptLow": "0.15",
         "ptUp": "1e15",
diff --git a/codeJE/workflows.yml b/codeJE/workflows.yml
index 3a761e48..8a39c1f7 100644
--- a/codeJE/workflows.yml
+++ b/codeJE/workflows.yml
@@ -34,7 +34,7 @@ workflows:
   o2-analysis-je-jet-deriveddata-producer:
     dependencies: [o2-analysis-je-emcal-correction-task]
 
-  o2-analysis-je-jet-finder:
+  o2-analysis-je-jet-finder-data-charged:
     dependencies: [o2-analysis-je-jet-deriveddata-producer]
 
   # Analysis tasks
@@ -44,7 +44,7 @@ workflows:
   # QA
 
   o2-analysis-je-jet-validation-qa:
-    dependencies: [o2-analysis-je-jet-finder, o2-analysis-je-jet-deriveddata-producer, o2-analysis-trackselection_runX]
+    dependencies: [o2-analysis-je-jet-finder-data-charged, o2-analysis-je-jet-deriveddata-producer, o2-analysis-trackselection_runX]
 
   o2-analysis-qa-efficiency:
     requires_mc: yes