diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml
index 11cf6a989..b82ccbd37 100644
--- a/ci/build.linux.gitlab-ci.yml
+++ b/ci/build.linux.gitlab-ci.yml
@@ -226,10 +226,6 @@ build:linux:rocm-latest:gcc-10:
     EIGEN_CI_CXX_COMPILER: g++-10
     EIGEN_CI_BUILD_TARGET: buildtests_gpu
     EIGEN_CI_ADDITIONAL_ARGS: -DEIGEN_TEST_HIP=on
-  tags:
-    - eigen-runner
-    - linux
-    - x86-64
 
 ######## Arm ###################################################################
 
diff --git a/ci/deploy.gitlab-ci.yml b/ci/deploy.gitlab-ci.yml
index 3c4db06b9..c6b0f6e51 100644
--- a/ci/deploy.gitlab-ci.yml
+++ b/ci/deploy.gitlab-ci.yml
@@ -9,8 +9,7 @@ deploy:tag:nightly:
     - git tag -f nightly $CI_COMMIT_SHORT_SHA
     - git push -f $EIGEN_CI_GIT_PUSH_URL tag nightly
   tags:
-    - linux
-    - eigen-runner
+    - saas-linux-small-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -33,8 +32,7 @@ deploy:docs:
     paths:
       - public
   tags:
-    - eigen-runner
-    - linux
+    - saas-linux-small-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen"
     - if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen"
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index 7b5c99064..d140fe6e8 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -453,6 +453,9 @@ macro(ei_set_sitename)
 endmacro()
 
 macro(ei_get_compilerver VAR)
+    if (NOT CMAKE_CXX_COMPILER_ID)
+      set(CMAKE_CXX_COMPILER_ID "<unknown>")
+    endif()
     if(MSVC)
       set(${VAR} "${CMAKE_CXX_COMPILER_VERSION}")
     elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "PGI")