diff --git a/.gitignore b/.gitignore
index 6defc076d658fdae44be4f9bffff26dcc854edbc..499b9772ee5bdddb3c2a0511e2b22afb837c5055 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@
 *.swp
 *.swo
 
-
-
+# VSCode default build directory
+build/
diff --git a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
index 617b3e584f677bbb1b40118bd207ff18a39decd0..0d1fcd9987d03831e61419fe920585cb567c6cbd 100644
--- a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 # Set up the project.
 cmake_minimum_required(VERSION 3.16...3.26)
 project( "DummyUserActionsPlugin" )
@@ -10,7 +10,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
     # Make the root module directory visible to CMake.
     list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake )
     # get global GeoModel version
-    include( GeoModelATLAS-version ) 
+    include( GeoModelATLAS-version )
     # set the project, with the version taken from the GeoModel parent project
     project( "DummyUserActionsPlugin" VERSION ${GeoModelATLAS_VERSION} LANGUAGES CXX )
     # Define color codes for CMake messages
@@ -58,9 +58,8 @@ file( GLOB SOURCES src/*.cxx )
 add_library( DummyUserActionsPlugin SHARED ${SOURCES} )
 
 target_link_libraries ( DummyUserActionsPlugin PUBLIC FullSimLight ${CMAKE_DL_LIBS} ${Geant4_LIBRARIES} )
-target_include_directories( DummyUserActionsPlugin PUBLIC 
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> ${FullSimLight_INCLUDE_DIR} )
+target_include_directories( DummyUserActionsPlugin PUBLIC
+   ${FullSimLight_INCLUDE_DIR} )
 
 
 source_group( "src" FILES ${SOURCES} )
diff --git a/GeoModelCore/GeoGenericFunctions/CMakeLists.txt b/GeoModelCore/GeoGenericFunctions/CMakeLists.txt
index 67fcfca3f3efcb1e6d8110febf6a0ce9fedd71a0..11e7233e12bf7c60fd900dd89a82df97e2899350 100644
--- a/GeoModelCore/GeoGenericFunctions/CMakeLists.txt
+++ b/GeoModelCore/GeoGenericFunctions/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cpp )
@@ -8,7 +8,7 @@ file( GLOB HEADERS GeoGenericFunctions/*.h GeoGenericFunctions/*.icc )
 add_library( GeoGenericFunctions SHARED ${HEADERS} ${SOURCES} )
 target_include_directories( GeoGenericFunctions PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoGenericFunctions" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoGenericFunctions PROPERTIES
diff --git a/GeoModelCore/GeoModelKernel/CMakeLists.txt b/GeoModelCore/GeoModelKernel/CMakeLists.txt
index 11b72cbb7b2caec71e275d075a2ff33e55d67531..f4242540e787a29c5d5b8b866b3de1079a479fbb 100644
--- a/GeoModelCore/GeoModelKernel/CMakeLists.txt
+++ b/GeoModelCore/GeoModelKernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -10,7 +10,7 @@ target_link_libraries( GeoModelKernel PUBLIC Eigen3::Eigen GeoGenericFunctions
    ${CMAKE_DL_LIBS} )
 target_include_directories( GeoModelKernel PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoModelKernel" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelKernel PROPERTIES
@@ -51,15 +51,14 @@ install( FILES ${HEADERS}
 foreach(_exeFile ${files})
   get_filename_component(_theExec ${_exeFile} NAME_WE)
   get_filename_component(_theLoc ${_exeFile} DIRECTORY)
-  
+
   if(${_theLoc} MATCHES "DoNotBuild")
     continue()
-  endif() 
-  
+  endif()
+
   add_executable(${_theExec} ${_exeFile})
   target_link_libraries( ${_theExec} GeoModelKernel)
   add_test(NAME ${_theExec}
            COMMAND ${_theExec})
 
 endforeach()
-
diff --git a/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt b/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
index 03fe5807050a679bbf6f2a76b9640ca601a43a27..52287268ce53399782dd25c75aa20eaf826ce014 100644
--- a/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
+++ b/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 # Package: HelloGeo
@@ -14,11 +14,11 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 
 # Find the needed dependencies, when building individually
-  message (${CMAKE_SOURCE_DIR}) 
+  message (${CMAKE_SOURCE_DIR})
   message (${PROJECT_SOURCE_DIR})
-  
+
 if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
-   find_package( GeoModelCore REQUIRED  ) 
+   find_package( GeoModelCore REQUIRED  )
 endif()
 
 
@@ -28,10 +28,6 @@ file( GLOB SOURCES src/*.cxx )
 add_library( KitchenSinkPlugin SHARED ${SOURCES} )
 target_link_libraries( KitchenSinkPlugin PUBLIC GeoModelCore::GeoModelKernel)
 
-target_include_directories( KitchenSinkPlugin PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
-
 source_group( "src" FILES ${SOURCES} )
 
 set_target_properties( KitchenSinkPlugin PROPERTIES
@@ -44,4 +40,3 @@ install( TARGETS KitchenSinkPlugin
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-
diff --git a/GeoModelExamples/MinimalPlugin/CMakeLists.txt b/GeoModelExamples/MinimalPlugin/CMakeLists.txt
index f18dbe0f13576663c90929ba38bd2f2cc0ec258e..59c5a684d3e257578f154f994baabfdffc75a6b5 100644
--- a/GeoModelExamples/MinimalPlugin/CMakeLists.txt
+++ b/GeoModelExamples/MinimalPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 # Package: MinimalPlugin
@@ -14,11 +14,11 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 
 # Find the needed dependencies, when building individually
-  message (${CMAKE_SOURCE_DIR}) 
+  message (${CMAKE_SOURCE_DIR})
   message (${PROJECT_SOURCE_DIR})
-  
+
 if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
-   find_package( GeoModelCore REQUIRED  ) 
+   find_package( GeoModelCore REQUIRED  )
 endif()
 
 
@@ -28,10 +28,6 @@ file( GLOB SOURCES src/*.cxx )
 add_library( MinimalPlugin SHARED ${SOURCES} )
 target_link_libraries( MinimalPlugin PUBLIC GeoModelCore::GeoModelKernel)
 
-target_include_directories( MinimalPlugin PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
-
 source_group( "src" FILES ${SOURCES} )
 
 set_target_properties( MinimalPlugin PROPERTIES
@@ -44,4 +40,3 @@ install( TARGETS MinimalPlugin
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-
diff --git a/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt b/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt
index 4a8db4175e3098082ccc20daf836c596771f821b..8c2f86068aa92de119fabde0933761064934a95b 100644
--- a/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt
+++ b/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 # Package: HelloGeo
@@ -14,11 +14,11 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 
 # Find the needed dependencies, when building individually
-  message (${CMAKE_SOURCE_DIR}) 
+  message (${CMAKE_SOURCE_DIR})
   message (${PROJECT_SOURCE_DIR})
-  
+
 if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
-   find_package( GeoModelCore REQUIRED  ) 
+   find_package( GeoModelCore REQUIRED  )
 endif()
 
 
@@ -28,10 +28,6 @@ file( GLOB SOURCES src/*.cxx )
 add_library( SurfaceTestPlugin SHARED ${SOURCES} )
 target_link_libraries( SurfaceTestPlugin PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelHelpers)
 
-target_include_directories( SurfaceTestPlugin PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
-
 source_group( "src" FILES ${SOURCES} )
 
 set_target_properties( SurfaceTestPlugin PROPERTIES
@@ -44,4 +40,3 @@ install( TARGETS SurfaceTestPlugin
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-
diff --git a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
index 434517536511f6643d7b0710f41d3d909cf982fc..717e9ead384deb39c498f0ebd4ba59eb2e4178c0 100644
--- a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 # Package: GeoMaterial2G4
@@ -18,7 +18,7 @@ add_library( GeoMaterial2G4 SHARED ${HEADERS} ${SOURCES} )
 target_include_directories( GeoMaterial2G4
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:include> )
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 target_link_libraries( GeoMaterial2G4 PUBLIC GeoModelCore::GeoModelKernel ${Geant4_LIBRARIES} )
 
 # Set installation of library headers
@@ -30,6 +30,6 @@ set_target_properties( GeoMaterial2G4 PROPERTIES
 
 # new test GeoModelG4
 install(TARGETS GeoMaterial2G4
-  EXPORT GeoMaterial2G4-export 
+  EXPORT GeoMaterial2G4-export
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoMaterial2G4 )
diff --git a/GeoModelG4/GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/CMakeLists.txt
index 143c8f22d13601e4337dce75e1a6285378aa7727..157a3cf8841aba6b9414ec9d9ebfbe4ff048cffa 100644
--- a/GeoModelG4/GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 # Package: GeoModel2G4
@@ -38,7 +38,7 @@ target_compile_definitions(GeoModel2G4 PRIVATE G4EXTENSION_SOLID_DIR=${PATHEXTEN
 target_include_directories(GeoModel2G4
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:include> )
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 target_link_libraries(GeoModel2G4
   PUBLIC  ${Geant4_LIBRARIES}
   PRIVATE GeoMaterial2G4 GeoModelCore::GeoModelKernel)
@@ -52,6 +52,6 @@ set_target_properties( GeoModel2G4 PROPERTIES
    SOVERSION ${PROJECT_VERSION_MAJOR} )
 # Install the library.
 install( TARGETS GeoModel2G4
-  EXPORT GeoModel2G4-export 
+  EXPORT GeoModel2G4-export
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModel2G4 )
diff --git a/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
index 55c9883f6043b6465bd87306a6c547808d61c887..fafcfaeddf8110e844bb06e1a071fd44c5eac8c4 100644
--- a/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
@@ -53,12 +53,10 @@ target_link_libraries( Geo2G4Lib
 target_include_directories( Geo2G4Lib SYSTEM PUBLIC ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} PRIVATE ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS} )
 target_include_directories( Geo2G4Lib PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 
 ### TODO: do we need this from Athena? Maybe not...
 # atlas_add_component( Geo2G4 ... )
 
 ### TODO: do we need this from Athena? Maybe not...
 # atlas_add_dictionary( LArWheelSolidCheckerDict ... )
-
-
diff --git a/GeoModelIO/GeoModelDBManager/CMakeLists.txt b/GeoModelIO/GeoModelDBManager/CMakeLists.txt
index 7eb42f1af7a018644585e7a19c7d59f74234d598..a7f20d61c29feb6a48c3fc143b865f8a6bab4160 100644
--- a/GeoModelIO/GeoModelDBManager/CMakeLists.txt
+++ b/GeoModelIO/GeoModelDBManager/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 ################################################################################
 # Package: GeoModelDBManager
 # author: Riccardo Maria BIANCHI @ CERN - 2017
@@ -16,7 +16,7 @@ add_library( GeoModelDBManager SHARED ${HEADERS} ${SOURCES} )
 target_link_libraries( GeoModelDBManager PRIVATE SQLite::SQLite3 )
 target_include_directories( GeoModelDBManager PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoModelDBManager" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelDBManager PROPERTIES
diff --git a/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt b/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt
index 59b93fabb7b58fed2fcffd6fde97ad0f2138f953..55b7f30dce7058ddf242a2342462551dc8bb5217 100644
--- a/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt
+++ b/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Set up how CMake should handle file names given to target_sources().
 if( POLICY CMP0076 )
@@ -13,7 +13,7 @@ add_library( GeoModelErrorHandler INTERFACE )
 source_group( "GeoModelErrorHandler" FILES ${HEADERS} )
 target_include_directories( GeoModelErrorHandler INTERFACE
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 target_link_libraries( GeoModelErrorHandler INTERFACE Qt5::Core )
 if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
    "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
diff --git a/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt b/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt
index ca1bb3fcdabfa7b74c5501ed49682d2a25e8f24d..72d6708c460a906d872bc73475d809c6d31d8bfd 100644
--- a/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt
+++ b/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 ################################################################################
 # Package: GeoModelIOHelpers
 # author: Riccardo Maria BIANCHI <rbianchi@cern.ch> - 2023 Jan
@@ -16,7 +16,7 @@ target_link_libraries( GeoModelIOHelpers PUBLIC
 # even if the latter is headers only
 target_include_directories( GeoModelIOHelpers PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoModelIOHelpers" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelIOHelpers PROPERTIES
diff --git a/GeoModelIO/GeoModelRead/CMakeLists.txt b/GeoModelIO/GeoModelRead/CMakeLists.txt
index 7a12ae38a31eb22d080296e3e4b0df3510730a0a..904b659790da82ef70b2fda58fc6fdd750099c5a 100644
--- a/GeoModelIO/GeoModelRead/CMakeLists.txt
+++ b/GeoModelIO/GeoModelRead/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 ################################################################################
 # Package: GeoModelRead
 # author: Riccardo Maria BIANCHI <rbianchi@cern.ch> - 2017
@@ -15,7 +15,7 @@ target_link_libraries( GeoModelRead PUBLIC
 GeoModelKernel GeoModelDBManager TFPersistification )
 target_include_directories( GeoModelRead PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoModelRead" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelRead PROPERTIES
diff --git a/GeoModelIO/GeoModelWrite/CMakeLists.txt b/GeoModelIO/GeoModelWrite/CMakeLists.txt
index b29f91d60af20e1a43b1f0e89b9bde41d5937995..ade59c69d6825f52afe581c70ec04bbcef6f5dfb 100644
--- a/GeoModelIO/GeoModelWrite/CMakeLists.txt
+++ b/GeoModelIO/GeoModelWrite/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cpp )
@@ -10,7 +10,7 @@ target_link_libraries( GeoModelWrite PUBLIC
    GeoModelKernel GeoModelDBManager TFPersistification )
 target_include_directories( GeoModelWrite PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoModelWrite" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelWrite PROPERTIES
diff --git a/GeoModelIO/TFPersistification/CMakeLists.txt b/GeoModelIO/TFPersistification/CMakeLists.txt
index 0589986f4a8e121eb74566debb67f0d62c0b217d..85f185a09aba90fc276efe0e64273d6bc641a12b 100644
--- a/GeoModelIO/TFPersistification/CMakeLists.txt
+++ b/GeoModelIO/TFPersistification/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cpp )
@@ -10,7 +10,7 @@ target_link_libraries( TFPersistification PUBLIC
 GeoGenericFunctions GeoModelKernel )
 target_include_directories( TFPersistification PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "TFPersistification" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( TFPersistification PROPERTIES
diff --git a/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt b/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
index b3b922ecc2c5ea7eab9f5269cc76c9364559ce73..1792afc76e1eda961eb3ac89743113fd08e891d7 100644
--- a/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -6,10 +6,6 @@ file( GLOB SOURCES src/*.cxx )
 # Create the library.
 add_library( GMXPlugin SHARED ${SOURCES} )
 target_link_libraries( GMXPlugin PUBLIC GeoModelCore::GeoModelKernel XercesC::XercesC GeoModelXml )
-target_include_directories( GMXPlugin PUBLIC 
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
-source_group( "GMXPlugin" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GMXPlugin PROPERTIES
    VERSION ${PROJECT_VERSION}
@@ -33,12 +29,3 @@ install(TARGETS GMXPlugin
             COMPONENT Development
     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
-
-install( FILES ${HEADERS}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GMXPlugin
-   COMPONENT Development )
-
-# set ( PLUGIN_NAME  "GMXPlugin.so" )
-# ADD_CUSTOM_TARGET( GMX_plugin ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${GMXPlugin} ${PLUGIN_NAME} )
-
-
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
index 8e9375ae0f4dc9b84b49efe26f725828f165c63b..04e036d519935202088717d42ba80c30f108df97 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -14,9 +14,9 @@ find_package( ZLIB REQUIRED )
 add_library( GeoModelXml SHARED ${HEADERS} ${SOURCES} )
 # link libraries
 target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelHelpers GeoModelTools::ExpressionEvaluator XercesC::XercesC PRIVATE ZLIB::ZLIB  )
-target_include_directories( GeoModelXml PUBLIC 
+target_include_directories( GeoModelXml PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GeoModelXml" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelXml PROPERTIES
diff --git a/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt b/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
index 33c91f302076873b65ae865c164fe8ce28036cf8..733a2ff3ce0d688fa12abe0b7bed772ae6873047 100644
--- a/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
+++ b/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -12,7 +12,7 @@ target_link_libraries( GXClashPointSystems
    PRIVATE Qt${QT_VERSION}::Core Qt${QT_VERSION}::Widgets nlohmann_json::nlohmann_json )
 target_include_directories( GXClashPointSystems PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GXClashPointSystems" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
 set_target_properties( GXClashPointSystems PROPERTIES
diff --git a/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt b/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt
index e1e2c7d83af1ec32068af5a2fb2726219f93bd0f..09d9d8a87af0d190f6424dca3868dcdb44b1227b 100644
--- a/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt
+++ b/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -8,12 +8,12 @@ find_package (HDF5 REQUIRED)
 # Add the library.
 add_library( GXHitDisplaySystems SHARED ${SOURCES} ${HEADERS} ${UIS} )
 target_link_libraries( GXHitDisplaySystems
-   PUBLIC Coin::Coin GXBase 
+   PUBLIC Coin::Coin GXBase
    PRIVATE Qt${QT_VERSION}::Core Qt${QT_VERSION}::Widgets ${HDF5_CXX_LIBRARIES} ${HDF5_LIBRARIES} )
 target_include_directories( GXHitDisplaySystems PUBLIC
-   ${HDF5_CXX_INCLUDE_DIRS} 
+   ${HDF5_CXX_INCLUDE_DIRS}
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GXHitDisplaySystems" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
 set_target_properties( GXHitDisplaySystems PROPERTIES
diff --git a/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt b/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt
index bc690cd322d977679d27a1ff98a6734f35dc6c00..690c605d6bad0cc2a928b1cd2777f5d65588b303 100644
--- a/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt
+++ b/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -8,12 +8,12 @@ file( GLOB UIS src/*.ui )
 # Add the library.
 add_library( GXTrackDisplaySystems SHARED ${SOURCES} ${HEADERS} ${UIS} )
 target_link_libraries( GXTrackDisplaySystems
-   PUBLIC Coin::Coin GXBase 
+   PUBLIC Coin::Coin GXBase
    PRIVATE Qt${QT_VERSION}::Core Qt${QT_VERSION}::Widgets ${HDF5_LIBRARIES} )
 target_include_directories( GXTrackDisplaySystems PUBLIC
-   ${HDF5_CXX_INCLUDE_DIRS} 
+   ${HDF5_CXX_INCLUDE_DIRS}
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "GXTrackDisplaySystems" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
 set_target_properties( GXTrackDisplaySystems PROPERTIES
diff --git a/GeoModelVisualization/VP1Base/CMakeLists.txt b/GeoModelVisualization/VP1Base/CMakeLists.txt
index ca2b6aba0e2e94d3986fa6d37a0d12773f78334c..0118b8277699d02f5c15033524e8d8a5c2c532da 100644
--- a/GeoModelVisualization/VP1Base/CMakeLists.txt
+++ b/GeoModelVisualization/VP1Base/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -8,7 +8,7 @@ file( GLOB RCS src/*.qrc )
 
 # Add the library.
 add_library( GXBase SHARED ${SOURCES} ${HEADERS} ${UIS} ${RCS} )
-if (GEOMODEL_USE_QT6) 
+if (GEOMODEL_USE_QT6)
   target_link_libraries( GXBase
      PUBLIC Coin::Coin Qt${QT_VERSION}::Core Qt${QT_VERSION}::Gui Qt${QT_VERSION}::Widgets Qt${QT_VERSION}::Core5Compat SoQt::SoQt
      PRIVATE Qt${QT_VERSION}::PrintSupport Qt${QT_VERSION}::OpenGL GXHEPVis )
@@ -20,7 +20,7 @@ endif()
 
 target_include_directories( GXBase PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 target_compile_definitions( GXBase PUBLIC
    -DQT_NO_DEBUG_OUTPUT -DQT_NO_INFO_OUTPUT )
 source_group( "VP1Base" FILES ${HEADERS} )
diff --git a/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt b/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt
index 488841c6cf9c6a1a9bc195155b330ef233ad21b4..052eb91568070c65d2f4d5d3fcf7eb7dc7dd044e 100644
--- a/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt
+++ b/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -11,7 +11,7 @@ target_link_libraries( GXGeometryPlugin
    PRIVATE GXGeometrySystems GXGuideLineSystems GXClashPointSystems GXHitDisplaySystems GXTrackDisplaySystems)
 target_include_directories( GXGeometryPlugin PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "VP1GeometryPlugin" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} ${UIS} )
 
diff --git a/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt b/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
index a912560a308193c94e82447bcd5d3dc301478962..c8c3eed5c403ec3f7c7e50e6f9e1f4d6a23e6e97 100644
--- a/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
+++ b/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -15,7 +15,7 @@ target_link_libraries( GXGeometrySystems
            GeoModelIO::GeoModelWrite GeoModelIO::GeoModelDBManager GXHEPVis )
 target_include_directories( GXGeometrySystems PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 target_compile_definitions( GXGeometrySystems PRIVATE
    GEOMODEL_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" )
 source_group( "VP1GeometrySystems" FILES ${HEADERS} )
diff --git a/GeoModelVisualization/VP1Gui/CMakeLists.txt b/GeoModelVisualization/VP1Gui/CMakeLists.txt
index 6cc53cc91b5f5cd6b66b40b36d8d9e610e442989..3fdcfe6a2c031f5d7dfc132cc4049764f892a0e6 100644
--- a/GeoModelVisualization/VP1Gui/CMakeLists.txt
+++ b/GeoModelVisualization/VP1Gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -13,7 +13,7 @@ target_link_libraries( GXGui
    PRIVATE Qt${QT_VERSION}::PrintSupport Qt${QT_VERSION}::OpenGL )
 target_include_directories( GXGui PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "VP1Gui" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
 set_target_properties( GXGui PROPERTIES
diff --git a/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt b/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt
index 100e56767a93500eba655ffca38b6ce7b69346c0..a9dbb0d75f002988a4036c5920039d1eeb383cc5 100644
--- a/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt
+++ b/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -12,7 +12,7 @@ target_link_libraries( GXGuideLineSystems
    PRIVATE GeoModelCore::GeoModelKernel GXHEPVis )
 target_include_directories( GXGuideLineSystems PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 source_group( "VP1GuideLineSystems" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} ${UIS} )
 set_target_properties( GXGuideLineSystems PROPERTIES
diff --git a/GeoModelVisualization/VP1HEPVis/CMakeLists.txt b/GeoModelVisualization/VP1HEPVis/CMakeLists.txt
index d75338ba7a63d24740083a24e7a36923babb76e8..a512c64bf0200b7d8eda88c23e4bade0afd1625e 100644
--- a/GeoModelVisualization/VP1HEPVis/CMakeLists.txt
+++ b/GeoModelVisualization/VP1HEPVis/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -8,7 +8,7 @@ file( GLOB HEADERS VP1HEPVis/*.h )
 add_library( GXHEPVis SHARED ${SOURCES} ${HEADERS} )
 target_include_directories( GXHEPVis PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:include> )
+   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
 target_link_libraries( GXHEPVis
     PUBLIC Coin::Coin OpenGL::GL GeoModelCore::GeoModelKernel)
 source_group( "VP1HEPVis" FILES ${HEADERS} )
diff --git a/athena_ci/apply_patches.sh b/athena_ci/apply_patches.sh
index 2582d3a4b71b7fde84aae77448dd7fc5ab530f44..0a1ecd28bd9a3befd8b49cb21492c4341d77f875 100755
--- a/athena_ci/apply_patches.sh
+++ b/athena_ci/apply_patches.sh
@@ -25,14 +25,16 @@ fill_line "-"
 
 git checkout $NIGHTLY_COMMIT
 
-for p in "$SCRIPT_DIR"/patches/*.patch; do
-    echo "---- Applying ${p} ----"
-    patch -p1 < ${p}
-    #cat "${p}" | git am -3
-    #git --no-pager log -1 $sha
-    
-    fill_line "-"
-done
+if compgen -G "${SCRIPT_DIR}/patches/*.patch" > /dev/null; then
+    for p in "$SCRIPT_DIR"/patches/*.patch; do
+        echo "---- Applying ${p} ----"
+        patch -p1 < ${p}
+        #cat "${p}" | git am -3
+        #git --no-pager log -1 $sha
+
+        fill_line "-"
+    done
+fi
 
 
 #git diff HEAD ${NIGHTLY_COMMIT}
diff --git a/athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch b/athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch
deleted file mode 100644
index c5ee80b5cae38032cabe2c632c047d337c08014b..0000000000000000000000000000000000000000
--- a/athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2404442b4ba8f6dbc92f0b0f25e201317ec2c141 Mon Sep 17 00:00:00 2001
-From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
-Date: Tue, 30 Apr 2024 09:41:11 +0200
-Subject: [PATCH] Adapt to interface change using GeoPositioning objects
-
----
- .../GeoModelUtilities/GeoAlignmentStore.h          | 14 +++++++-------
- .../GeoModelUtilities/src/GeoAlignmentStore.cxx    |  4 ++--
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
-index 4756f948abc..da2b126bd4b 100755
---- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
-+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
-@@ -49,19 +49,19 @@ public:
-     ///         full physical volume.
-     /// @param fullPhysVol: Full physical volume in the GeoModel tree to which the transforms belongs to
-     /// @param physVolTrf:  Aligned placement of the physical volume in space
--    virtual void setAbsPosition(const GeoVFullPhysVol* fullPhysVol, 
-+    virtual void setAbsPosition(const GeoNodePositioning* fullPhysVol, 
-                                 const GeoTrf::Transform3D& physVolTrf) override final;
-     /// @brief: Returns the aligned transform associated with the full physical volume. Returns a 
-     ///         nullptr if the physical volume has not been added before
--    virtual const GeoTrf::Transform3D* getAbsPosition(const GeoVFullPhysVol* fullPhysVol) const override final;
-+    virtual const GeoTrf::Transform3D* getAbsPosition(const GeoNodePositioning* fullPhysVol) const override final;
-     /// @brief: Caches the aboslute transform of the perfectly aligned physical volume.
-     /// @param fullPhysVol: Full physical volume in the GeoModel tree to which the transforms belongs to
-     /// @param unAlignedTrf: Nominal placement of the full physical volume.
--    virtual void setDefAbsPosition(const GeoVFullPhysVol* fullPhysVol, 
-+    virtual void setDefAbsPosition(const GeoNodePositioning* fullPhysVol, 
-                                   const GeoTrf::Transform3D& unAlignedTrf) override final;
-     /// @brief: Returns the nominal position of the full phyiscal volume. Returns a nullptr if the
-     ///         nominal position of the full physical volume has not been added before to the map
--    virtual const GeoTrf::Transform3D* getDefAbsPosition(const GeoVFullPhysVol* fullPhysVol) const override final;
-+    virtual const GeoTrf::Transform3D* getDefAbsPosition(const GeoNodePositioning* fullPhysVol) const override final;
- 
-     /// @brief: Copies, the deltas, the absolute and the nominal positions of the other map
-     ///         to this object. Returns false if the two maps partially overlap.
-@@ -76,7 +76,7 @@ public:
-     using DeltaMap = TransformMap<GeoAlignableTransform, GeoTrf::Transform3D>;
-     using DeltaMapPtr = GeoModel::TransientConstSharedPtr<DeltaMap>;
- 
--    using PositioningMap = TransformMap<GeoVFullPhysVol, GeoTrf::Transform3D>;
-+    using PositioningMap = TransformMap<GeoNodePositioning, GeoTrf::Transform3D>;
-     using PositioningMapPtr = GeoModel::TransientConstSharedPtr<PositioningMap>;
- private:    
-     DeltaMapPtr m_deltas{std::make_unique<DeltaMap>()};
-@@ -92,10 +92,10 @@ public:
- inline const GeoTrf::Transform3D* GeoAlignmentStore::getDelta(const GeoAlignableTransform* axf) const { 
-     return m_deltas->getTransform(axf); 
- }
--inline const GeoTrf::Transform3D* GeoAlignmentStore::getAbsPosition(const GeoVFullPhysVol* fpv) const {
-+inline const GeoTrf::Transform3D* GeoAlignmentStore::getAbsPosition(const GeoNodePositioning* fpv) const {
-     return m_absPositions->getTransform(fpv); 
- }
--inline const GeoTrf::Transform3D* GeoAlignmentStore::getDefAbsPosition(const GeoVFullPhysVol* fpv) const {
-+inline const GeoTrf::Transform3D* GeoAlignmentStore::getDefAbsPosition(const GeoNodePositioning* fpv) const {
-     return m_defAbsPositions->getTransform(fpv);
- }
- 
-diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx
-index f0865e42b55..b9282562062 100644
---- a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx
-+++ b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx
-@@ -11,10 +11,10 @@ void GeoAlignmentStore::setDelta(const GeoAlignableTransform* axf, const GeoTrf:
- void GeoAlignmentStore::setDelta(const GeoAlignableTransform* axf, std::shared_ptr<const GeoTrf::Transform3D> trans) {
-     m_deltas->setTransform(axf, std::move(trans));
- }
--void GeoAlignmentStore::setAbsPosition(const GeoVFullPhysVol* fpv, const GeoTrf::Transform3D& xf) { 
-+void GeoAlignmentStore::setAbsPosition(const GeoNodePositioning* fpv, const GeoTrf::Transform3D& xf) { 
-     m_absPositions->setTransform(fpv, xf); 
- }
--void GeoAlignmentStore::setDefAbsPosition(const GeoVFullPhysVol* fpv, const GeoTrf::Transform3D& xf) {
-+void GeoAlignmentStore::setDefAbsPosition(const GeoNodePositioning* fpv, const GeoTrf::Transform3D& xf) {
-     m_defAbsPositions->setTransform(fpv, xf);
- }
- void GeoAlignmentStore::lockDelta() {
--- 
-2.34.1
-