diff --git a/Analysis/DataModel/include/Analysis/HFSecondaryVertex.h b/Analysis/DataModel/include/Analysis/HFSecondaryVertex.h
index b8a5caeae6330..67a9303d370cc 100644
--- a/Analysis/DataModel/include/Analysis/HFSecondaryVertex.h
+++ b/Analysis/DataModel/include/Analysis/HFSecondaryVertex.h
@@ -43,22 +43,19 @@ using BigTracks = soa::Join<Tracks, TracksCov, TracksExtra, HFSelTrack, pidRespT
 
 namespace hf_track_index
 {
-DECLARE_SOA_INDEX_COLUMN(Collision, collision);
 DECLARE_SOA_INDEX_COLUMN_FULL(Index0, index0, int, BigTracks, "fIndex0");
 DECLARE_SOA_INDEX_COLUMN_FULL(Index1, index1, int, BigTracks, "fIndex1");
 DECLARE_SOA_INDEX_COLUMN_FULL(Index2, index2, int, BigTracks, "fIndex2");
 DECLARE_SOA_INDEX_COLUMN_FULL(Index3, index3, int, BigTracks, "fIndex3");
-DECLARE_SOA_COLUMN(HFflag, hfflag, int);
+DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t);
 } // namespace hf_track_index
 
 DECLARE_SOA_TABLE(HfTrackIndexProng2, "AOD", "HFTRACKIDXP2",
-                  hf_track_index::CollisionId,
                   hf_track_index::Index0Id,
                   hf_track_index::Index1Id,
                   hf_track_index::HFflag);
 
 DECLARE_SOA_TABLE(HfTrackIndexProng3, "AOD", "HFTRACKIDXP3",
-                  hf_track_index::CollisionId,
                   hf_track_index::Index0Id,
                   hf_track_index::Index1Id,
                   hf_track_index::Index2Id,
diff --git a/Analysis/Tasks/PWGHF/HFCandidateCreator2Prong.cxx b/Analysis/Tasks/PWGHF/HFCandidateCreator2Prong.cxx
index 2592e543a7975..5185085e64c85 100644
--- a/Analysis/Tasks/PWGHF/HFCandidateCreator2Prong.cxx
+++ b/Analysis/Tasks/PWGHF/HFCandidateCreator2Prong.cxx
@@ -45,7 +45,7 @@ struct HFCandidateCreator2Prong {
   double massPiK{0.};
   double massKPi{0.};
 
-  void process(aod::Collision const& collision,
+  void process(aod::Collisions const& collisions,
                aod::HfTrackIndexProng2 const& rowsTrackIndexProng2,
                aod::BigTracks const& tracks)
   {
@@ -63,6 +63,7 @@ struct HFCandidateCreator2Prong {
     for (const auto& rowTrackIndexProng2 : rowsTrackIndexProng2) {
       auto trackParVarPos1 = getTrackParCov(rowTrackIndexProng2.index0());
       auto trackParVarNeg1 = getTrackParCov(rowTrackIndexProng2.index1());
+      auto collision = rowTrackIndexProng2.index0().collision();
 
       // reconstruct the 2-prong secondary vertex
       if (df.process(trackParVarPos1, trackParVarNeg1) == 0)
diff --git a/Analysis/Tasks/PWGHF/HFCandidateCreator3Prong.cxx b/Analysis/Tasks/PWGHF/HFCandidateCreator3Prong.cxx
index 4468db49e558e..07096f904515c 100644
--- a/Analysis/Tasks/PWGHF/HFCandidateCreator3Prong.cxx
+++ b/Analysis/Tasks/PWGHF/HFCandidateCreator3Prong.cxx
@@ -44,7 +44,7 @@ struct HFCandidateCreator3Prong {
   double massK = RecoDecay::getMassPDG(kKPlus);
   double massPiKPi{0.};
 
-  void process(aod::Collision const& collision,
+  void process(aod::Collisions const& collisions,
                aod::HfTrackIndexProng3 const& rowsTrackIndexProng3,
                aod::BigTracks const& tracks)
   {
@@ -63,6 +63,7 @@ struct HFCandidateCreator3Prong {
       auto trackParVar0 = getTrackParCov(rowTrackIndexProng3.index0());
       auto trackParVar1 = getTrackParCov(rowTrackIndexProng3.index1());
       auto trackParVar2 = getTrackParCov(rowTrackIndexProng3.index2());
+      auto collision = rowTrackIndexProng3.index0().collision();
 
       // reconstruct the 3-prong secondary vertex
       if (df.process(trackParVar0, trackParVar1, trackParVar2) == 0)
diff --git a/Analysis/Tasks/PWGHF/HFTrackIndexSkimsCreator.cxx b/Analysis/Tasks/PWGHF/HFTrackIndexSkimsCreator.cxx
index 6aa4b1c4647c0..fef7ebac5c865 100644
--- a/Analysis/Tasks/PWGHF/HFTrackIndexSkimsCreator.cxx
+++ b/Analysis/Tasks/PWGHF/HFTrackIndexSkimsCreator.cxx
@@ -276,8 +276,7 @@ struct HFTrackIndexSkimsCreator {
 
           if (isSelectedCandD0) {
             // fill table row
-            rowTrackIndexProng2(trackPos1.collisionId(),
-                                trackPos1.globalIndex(),
+            rowTrackIndexProng2(trackPos1.globalIndex(),
                                 trackNeg1.globalIndex(), 1);
 
             // fill histograms
@@ -332,8 +331,7 @@ struct HFTrackIndexSkimsCreator {
               }
 
               // fill table row
-              rowTrackIndexProng3(trackPos1.collisionId(),
-                                  trackPos1.globalIndex(),
+              rowTrackIndexProng3(trackPos1.globalIndex(),
                                   trackNeg1.globalIndex(),
                                   trackPos2.globalIndex(), 2);
 
@@ -392,8 +390,7 @@ struct HFTrackIndexSkimsCreator {
               }
 
               // fill table row
-              rowTrackIndexProng3(trackNeg1.collisionId(),
-                                  trackNeg1.globalIndex(),
+              rowTrackIndexProng3(trackNeg1.globalIndex(),
                                   trackPos1.globalIndex(),
                                   trackNeg2.globalIndex(), 2);