diff --git a/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h b/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
index 9867d5e6..12dcc2a2 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
@@ -42,7 +42,7 @@ template <typename K, typename V> using ObjMapT = k4EDM4hep2LcioConv::VecMapT<K,
 using TrackMap         = ObjMapT<lcio::TrackImpl*, edm4hep::Track>;
 using ClusterMap       = ObjMapT<lcio::ClusterImpl*, edm4hep::Cluster>;
 using VertexMap        = ObjMapT<lcio::VertexImpl*, edm4hep::Vertex>;
-using TrackerHitMap    = ObjMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit>;
+using TrackerHitMap    = ObjMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit3D>;
 using SimTrackerHitMap = ObjMapT<lcio::SimTrackerHitImpl*, edm4hep::SimTrackerHit>;
 using CaloHitMap       = ObjMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit>;
 using SimCaloHitMap    = ObjMapT<lcio::SimCalorimeterHitImpl*, edm4hep::SimCalorimeterHit>;
diff --git a/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp b/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
index 76a373e5..9a4a8139 100644
--- a/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
+++ b/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
@@ -93,8 +93,8 @@ void EDM4hep2LcioTool::convertTracks(TrackMap& tracks_vec, const TrackerHitMap&
 // Add LCIO Collection Vector to LCIO event
 void EDM4hep2LcioTool::convertTrackerHits(TrackerHitMap& trackerhits_vec, const std::string& e4h_coll_name,
                                           const std::string& lcio_coll_name, lcio::LCEventImpl* lcio_event) {
-  DataHandle<edm4hep::TrackerHitCollection> trackerhits_handle{e4h_coll_name, Gaudi::DataHandle::Reader, this};
-  const auto                                trackerhits_coll = trackerhits_handle.get();
+  DataHandle<edm4hep::TrackerHit3DCollection> trackerhits_handle{e4h_coll_name, Gaudi::DataHandle::Reader, this};
+  const auto                                  trackerhits_coll = trackerhits_handle.get();
 
   MetaDataHandle<std::string> cellIDStrHandle{trackerhits_handle, edm4hep::CellIDEncoding, Gaudi::DataHandle::Reader};
 
diff --git a/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h b/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
index fd420ea5..2954bc86 100644
--- a/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
+++ b/k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
@@ -31,7 +31,14 @@
 #include "edm4hep/SimCalorimeterHit.h"
 #include "edm4hep/SimTrackerHit.h"
 #include "edm4hep/Track.h"
+#if __has_include("edm4hep/TrackerHit3D.h")
+#include "edm4hep/TrackerHit3D.h"
+#else
 #include "edm4hep/TrackerHit.h"
+namespace edm4hep {
+  using TrackerHit3D = edm4hep::TrackerHit;
+}
+#endif
 #include "edm4hep/TrackerHitPlane.h"
 #include "edm4hep/Vertex.h"
 
@@ -78,7 +85,7 @@ namespace k4MarlinWrapper {
     template <typename K, typename V> using ObjectMapT = k4EDM4hep2LcioConv::VecMapT<K, V>;
 
     ObjectMapT<EVENT::Track*, edm4hep::Track>                                 tracks{};
-    ObjectMapT<EVENT::TrackerHit*, edm4hep::TrackerHit>                       trackerHits{};
+    ObjectMapT<EVENT::TrackerHit*, edm4hep::TrackerHit3D>                     trackerHits{};
     ObjectMapT<EVENT::SimTrackerHit*, edm4hep::SimTrackerHit>                 simTrackerHits{};
     ObjectMapT<EVENT::CalorimeterHit*, edm4hep::CalorimeterHit>               caloHits{};
     ObjectMapT<EVENT::RawCalorimeterHit*, edm4hep::RawCalorimeterHit>         rawCaloHits{};
diff --git a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
index 11015a54..2e45b8a6 100644
--- a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
+++ b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
@@ -112,7 +112,7 @@ namespace {
 
   struct ObjectMappings {
     ObjMapT<lcio::Track*, edm4hep::MutableTrack>                                 tracks{};
-    ObjMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit>                       trackerHits{};
+    ObjMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit3D>                     trackerHits{};
     ObjMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit>                 simTrackerHits{};
     ObjMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit>               caloHits{};
     ObjMapT<lcio::RawCalorimeterHit*, edm4hep::MutableRawCalorimeterHit>         rawCaloHits{};