diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99095408..f62398be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,9 @@
 cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
 
 project( opsinputs VERSION 0.1 LANGUAGES C CXX Fortran )
+set( CMAKE_CXX_STANDARD 17 )
+set( CMAKE_CXX_STANDARD_REQUIRED ON )
+set( CMAKE_CXX_EXTENSIONS OFF )
 
 set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH})
 
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 76f4056f..b4521a52 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -1,43 +1,9 @@
 # (C) Crown Copyright 2021, the Met Office. All rights reserved.
 #
 
-# Include macros for creating links and symlinks
-include( opsinputs_functions )
+file(INSTALL "global" "ukv" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-# Add list of resource files
-list( APPEND opsinputs_etc
-  global/cx/ABIClr.nl
-  global/cx/AHIClr.nl
-  global/cx/AIRS.nl
-  global/cx/AMSR.nl
-  global/cx/ATMS.nl
-  global/cx/ATOVS.nl
-  global/cx/CrIS.nl
-  global/cx/GMIlow.nl
-  global/cx/GMIhigh.nl
-  global/cx/GPSRO.nl
-  global/cx/GroundGPS.nl
-  global/cx/IASI.nl
-  global/cx/MWRI.nl
-  global/cx/SEVIRIClr.nl
-  global/cx/SatTCWV.nl
-  global/cx/Sonde.nl
-  global/cx/SSMIS.nl
-  global/varobs/ABIClr.nl
-  global/varobs/AHIClr.nl
-  global/varobs/AIRS.nl
-  global/varobs/ATMS.nl
-  global/varobs/ATOVS.nl
-  global/varobs/CrIS.nl
-  global/varobs/GPSRO.nl
-  global/varobs/IASI.nl
-  global/varobs/SEVIRIClr.nl
-  global/varobs/Scatwind.nl
-  global/varobs/Sonde.nl
-  ukv/cx/Sonde.nl
-  ukv/varobs/Sonde.nl
+install(
+  DIRECTORY "global" "ukv"
+  DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/"
 )
-
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/global/cx)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/global/varobs)
-CREATE_SYMLINKS( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${opsinputs_etc} )