diff --git a/CMakeLists.txt b/CMakeLists.txt
index a728338d..eac9a90d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 # Ninja compiler output
 include(cmake/compiler_output.cmake)
 
-find_package(LCIO REQUIRED)
+find_package(LCIO 2.20.1 REQUIRED)
 find_package(podio REQUIRED)
 find_package(EDM4HEP 0.10.1 REQUIRED)
 
diff --git a/k4EDM4hep2LcioConv/CMakeLists.txt b/k4EDM4hep2LcioConv/CMakeLists.txt
index 773d21fa..7495cf52 100644
--- a/k4EDM4hep2LcioConv/CMakeLists.txt
+++ b/k4EDM4hep2LcioConv/CMakeLists.txt
@@ -5,12 +5,11 @@ add_library(k4EDM4hep2LcioConv SHARED
 add_library(k4EDM4hep2LcioConv::k4EDM4hep2LcioConv ALIAS k4EDM4hep2LcioConv)
 
 target_include_directories(k4EDM4hep2LcioConv PUBLIC
-  ${LCIO_INCLUDE_DIRS}
   $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 target_link_libraries(k4EDM4hep2LcioConv PUBLIC
-  ${LCIO_LIBRARIES}
+  LCIO::lcio
   EDM4HEP::edm4hep)
 
 set(public_headers
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e5063f0f..8ae868cc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_library(edmCompare SHARED src/CompareEDM4hepLCIO.cc src/ObjectMapping.cc src/CompareEDM4hepEDM4hep.cc)
-target_link_libraries(edmCompare PUBLIC EDM4HEP::edm4hep ${LCIO_LIBRARIES})
+target_link_libraries(edmCompare PUBLIC EDM4HEP::edm4hep LCIO::lcio)
 target_include_directories(edmCompare PUBLIC ${LCIO_INCLUDE_DIRS})
 
 add_library(TestUtils SHARED src/EDM4hep2LCIOUtilities.cc)
-target_link_libraries(TestUtils PUBLIC EDM4HEP::edm4hep ${LCIO_LIBRARIES})
+target_link_libraries(TestUtils PUBLIC EDM4HEP::edm4hep LCIO::lcio)
 target_include_directories(TestUtils PUBLIC ${LCIO_INCLUDE_DIRS})
 
 add_executable(compare-contents compare_contents.cpp)
@@ -26,7 +26,7 @@ target_include_directories(edm4hep_roundtrip PRIVATE
 add_test(NAME edm4hep_roundtrip COMMAND edm4hep_roundtrip)
 
 include(ExternalData)
-list(APPEND ExternalData_URL_TEMPLATES
+set(ExternalData_URL_TEMPLATES
  "https://key4hep.web.cern.ch:443/testFiles/k4EDM4hep2LcioConv/%(hash)"
  )