diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 8e14948..b1d9ca9 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -9,8 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - { os: macos-10.15 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
-        - { os: macos-11.0  } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md#xcode
+        - { os: macos-10.15 }
+        - { os: macos-11.0  }
         build: [Debug, Release]
 
     name: "${{matrix.config.os}}:${{matrix.build}}"
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 6ff99f5..db09ac7 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -12,8 +12,9 @@ jobs:
         compiler:
         - { cc: "gcc-9",    cxx: "g++-9" }
         - { cc: "gcc-10",   cxx: "g++-10" }
-        - { cc: "clang-9",  cxx: "clang++-9" }
         - { cc: "clang-10", cxx: "clang++-10" }
+        - { cc: "clang-11", cxx: "clang++-11" }
+        - { cc: "clang-12", cxx: "clang++-12" }
 
     name: "${{matrix.compiler.cxx}}:${{matrix.build}}"
     steps:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f82f8e..4a48cfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.14)
 
 project(nameof VERSION "0.10.0" LANGUAGES CXX)
 
@@ -32,7 +32,8 @@ target_include_directories(${PROJECT_NAME}
 
 write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
         VERSION ${PROJECT_VERSION}
-        COMPATIBILITY AnyNewerVersion)
+        COMPATIBILITY AnyNewerVersion
+        ARCH_INDEPENDENT)
 
 if(NAMEOF_OPT_INSTALL)
     install(TARGETS ${PROJECT_NAME}