diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8a829c3bd4..943d75d0bc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,9 @@ if(HPX_WITH_INSTALLED_VERSION)
   return()
 endif()
 
+# ##############################################################################
+string(TIMESTAMP HPX_COPYRIGHT_YEAR "%Y")
+
 # ##############################################################################
 # Build all of HPX
 # ##############################################################################
diff --git a/cmake/HPX_SetupNanobench.cmake b/cmake/HPX_SetupNanobench.cmake
index 14ba9880a20..431e0ea9bf1 100644
--- a/cmake/HPX_SetupNanobench.cmake
+++ b/cmake/HPX_SetupNanobench.cmake
@@ -1,3 +1,9 @@
+# Copyright (c) 2024 Hartmut Kaiser
+#
+# SPDX-License-Identifier: BSL-1.0
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 include(FetchContent)
 
 fetchcontent_declare(
diff --git a/cmake/templates/HPXCacheVariables.cmake.in b/cmake/templates/HPXCacheVariables.cmake.in
index d8d62649ba5..2b21dad5550 100644
--- a/cmake/templates/HPXCacheVariables.cmake.in
+++ b/cmake/templates/HPXCacheVariables.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ste||ar Group
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
index 59f4d2cad8b..5876363ef3d 100644
--- a/cmake/templates/HPXConfig.cmake.in
+++ b/cmake/templates/HPXConfig.cmake.in
@@ -1,3 +1,4 @@
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2015 Andreas Schaefer
 #
diff --git a/cmake/templates/HPXMacros.cmake.in b/cmake/templates/HPXMacros.cmake.in
index a3dd7a5f8e1..f670efd96c7 100644
--- a/cmake/templates/HPXMacros.cmake.in
+++ b/cmake/templates/HPXMacros.cmake.in
@@ -1,3 +1,4 @@
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2015 Andreas Schaefer
 # Copyright (c) 2019 Patrick Diehl
diff --git a/cmake/templates/cmake_variables.rst.in b/cmake/templates/cmake_variables.rst.in
index 2a6752e668e..b199673370c 100644
--- a/cmake/templates/cmake_variables.rst.in
+++ b/cmake/templates/cmake_variables.rst.in
@@ -1,4 +1,5 @@
 ..
+   Copyright (C) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
    Copyright (C) 2018 Mikael Simberg
    Copyright (C) 2014 Thomas Heller
 
diff --git a/cmake/templates/compatibility_header.hpp.in b/cmake/templates/compatibility_header.hpp.in
index b024d8191f4..2372318ba49 100644
--- a/cmake/templates/compatibility_header.hpp.in
+++ b/cmake/templates/compatibility_header.hpp.in
@@ -1,4 +1,4 @@
-//  Copyright (c) 2020-2022 STE||AR Group
+//  Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/cmake/templates/conf.py.in b/cmake/templates/conf.py.in
index 29e68c51e42..842fcc52477 100644
--- a/cmake/templates/conf.py.in
+++ b/cmake/templates/conf.py.in
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2018 Mikael Simberg
 #
 # SPDX-License-Identifier: BSL-1.0
diff --git a/cmake/templates/config_defines_entries_for_modules.cpp.in b/cmake/templates/config_defines_entries_for_modules.cpp.in
index aa791399279..b8fd0a3c335 100644
--- a/cmake/templates/config_defines_entries_for_modules.cpp.in
+++ b/cmake/templates/config_defines_entries_for_modules.cpp.in
@@ -1,3 +1,4 @@
+//  Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 //  Copyright (c) 2017-2022 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
diff --git a/cmake/templates/config_defines_strings.hpp.in b/cmake/templates/config_defines_strings.hpp.in
index e67c2e64539..562452c6625 100644
--- a/cmake/templates/config_defines_strings.hpp.in
+++ b/cmake/templates/config_defines_strings.hpp.in
@@ -1,3 +1,4 @@
+//  Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 //  Copyright (c) 2017-2019 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
diff --git a/cmake/templates/global_module_header.hpp.in b/cmake/templates/global_module_header.hpp.in
index 7da46f9307d..d22d90dcd14 100644
--- a/cmake/templates/global_module_header.hpp.in
+++ b/cmake/templates/global_module_header.hpp.in
@@ -1,4 +1,4 @@
-//  Copyright (c) 2019-2022 STE||AR Group
+//  Copyright (c) 2019-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/cmake/templates/hpx_application.pc.in b/cmake/templates/hpx_application.pc.in
index f7b32d7c3e4..0263543fd95 100644
--- a/cmake/templates/hpx_application.pc.in
+++ b/cmake/templates/hpx_application.pc.in
@@ -1,3 +1,4 @@
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2018 Christopher Hinz
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
diff --git a/cmake/templates/hpx_component.pc.in b/cmake/templates/hpx_component.pc.in
index 38260fc0e3e..5981c240b8b 100644
--- a/cmake/templates/hpx_component.pc.in
+++ b/cmake/templates/hpx_component.pc.in
@@ -1,3 +1,4 @@
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2018 Christopher Hinz
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
index eb57fd69d4c..cf21719761e 100755
--- a/cmake/templates/hpxcxx.in
+++ b/cmake/templates/hpxcxx.in
@@ -1,5 +1,6 @@
 #! @Python_EXECUTABLE@
 #
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2014 Steven R. Brandt
 #
 # SPDX-License-Identifier: BSL-1.0
diff --git a/cmake/templates/hpxdep_index.html.in b/cmake/templates/hpxdep_index.html.in
index 706d45d6b42..a3d3c772536 100644
--- a/cmake/templates/hpxdep_index.html.in
+++ b/cmake/templates/hpxdep_index.html.in
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2022 Hartmut Kaiser
+    Copyright (c) 2022-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 
     SPDX-License-Identifier: BSL-1.0
     Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
index 3bc50eacd07..1e02f535e9e 100755
--- a/cmake/templates/hpxrun.py.in
+++ b/cmake/templates/hpxrun.py.in
@@ -1,5 +1,6 @@
 #! @Python_EXECUTABLE@
 #
+# Copyright (c) 2020-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 # Copyright (c) 2014 Thomas Heller
 #
 # SPDX-License-Identifier: BSL-1.0
diff --git a/cmake/templates/modules_enabled.hpp.in b/cmake/templates/modules_enabled.hpp.in
index ea64b12efa2..9fb64824ea7 100644
--- a/cmake/templates/modules_enabled.hpp.in
+++ b/cmake/templates/modules_enabled.hpp.in
@@ -1,4 +1,4 @@
-//  Copyright (c) 2019 STE||AR Group
+//  Copyright (c) 2019-@HPX_COPYRIGHT_YEAR@ STE||AR Group
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/libs/core/testing/src/performance.cpp b/libs/core/testing/src/performance.cpp
index 0227a776785..6b236915784 100644
--- a/libs/core/testing/src/performance.cpp
+++ b/libs/core/testing/src/performance.cpp
@@ -46,7 +46,7 @@ namespace hpx::util {
         char const* nanobench_hpx_simple_template() noexcept
         {
             return R"DELIM(Results:
-{{#result}}        
+{{#result}}
 name: {{name}},
 executor: {{context(executor)}},
 average: {{average(elapsed)}}{{^-last}}
@@ -238,7 +238,7 @@ average: {{average(elapsed)}}{{^-last}}
         using timer = std::chrono::high_resolution_clock;
         for (std::size_t i = 0; i != steps; ++i)
         {
-            // For now we don't flush the cache
+            // For now, we don't flush the cache
             //flush_cache();
             timer::time_point start = timer::now();
             test();