diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 4029e37..3f2075b 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -11,14 +11,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake)
 # enables sanitizers support using the the `USE_SANITIZER` flag available values are: Address,
 # Memory, MemoryWithOrigins, Undefined, Thread, Leak, 'Address;Undefined'
 if(USE_SANITIZER OR USE_STATIC_ANALYZER)
-  CPMAddPackage(
-    NAME StableCoder-cmake-scripts
-    GITHUB_REPOSITORY StableCoder/cmake-scripts
-    GIT_TAG 3d2d5a9fb26f0ce24e3e4eaeeff686ec2ecfb3fb
-  )
+  CPMAddPackage("gh:StableCoder/cmake-scripts#3d2d5a9fb26f0ce24e3e4eaeeff686ec2ecfb3fb")
 
   if(USE_SANITIZER)
-    include(${StableCoder-cmake-scripts_SOURCE_DIR}/sanitizers.cmake)
+    include(${cmake-scripts_SOURCE_DIR}/sanitizers.cmake)
   endif()
 
   if(USE_STATIC_ANALYZER)
@@ -66,9 +62,5 @@ endif()
 
 # enables CCACHE support through the USE_CCACHE flag possible values are: YES, NO or equivalent
 if(USE_CCACHE)
-  CPMAddPackage(
-    NAME Ccache.cmake
-    GITHUB_REPOSITORY TheLartians/Ccache.cmake
-    VERSION 1.2.1
-  )
+  CPMAddPackage("gh:TheLartians/Ccache.cmake@1.2.1")
 endif()
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index 8f5cbfe..e143348 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -6,15 +6,9 @@ project(GreeterDocs)
 
 include(../cmake/CPM.cmake)
 
+CPMAddPackage("gh:mosra/m.css#42d4a9a48f31f5df6e246c948403b54b50574a2a")
 CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
 
-CPMAddPackage(
-  NAME MCSS
-  DOWNLOAD_ONLY YES
-  GITHUB_REPOSITORY mosra/m.css
-  GIT_TAG 42d4a9a48f31f5df6e246c948403b54b50574a2a
-)
-
 # ---- Doxygen variables ----
 
 # set Doxyfile variables
diff --git a/standalone/CMakeLists.txt b/standalone/CMakeLists.txt
index ae575d9..a8248f1 100644
--- a/standalone/CMakeLists.txt
+++ b/standalone/CMakeLists.txt
@@ -11,7 +11,6 @@ include(../cmake/tools.cmake)
 include(../cmake/CPM.cmake)
 
 CPMAddPackage("gh:jarro2783/cxxopts@2.2.0")
-
 CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
 
 # ---- Create standalone executable ----
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e22e2dd..4390d09 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,13 +23,7 @@ else()
   CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
 endif()
 
-CPMAddPackage(
-  NAME Format.cmake
-  GITHUB_REPOSITORY TheLartians/Format.cmake
-  VERSION 1.6
-  OPTIONS # enable cmake formatting
-          "FORMAT_CHECK_CMAKE ON"
-)
+CPMAddPackage("gh:TheLartians/Format.cmake@1.7.0")
 
 # ---- Create binary ----