diff --git a/.gitlab/ci/ctest_build.cmake b/.gitlab/ci/ctest_build.cmake
index 3795d6d00..38a55c8c8 100644
--- a/.gitlab/ci/ctest_build.cmake
+++ b/.gitlab/ci/ctest_build.cmake
@@ -24,7 +24,14 @@ ctest_build(APPEND
   RETURN_VALUE build_result)
 
 if(NOT DEFINED ENV{GITLAB_CI_EMULATION})
-  ctest_submit(PARTS Build)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+    ctest_submit(PARTS Build BUILD_ID build_id)
+    message(STATUS "Build submission build_id: ${build_id}")
+  else()
+    ctest_submit(PARTS Build)
+  endif()
+
+
 endif()
 
 if (build_result)
diff --git a/.gitlab/ci/ctest_configure.cmake b/.gitlab/ci/ctest_configure.cmake
index e426ae0e6..6169dcbff 100644
--- a/.gitlab/ci/ctest_configure.cmake
+++ b/.gitlab/ci/ctest_configure.cmake
@@ -38,8 +38,15 @@ ctest_configure(APPEND
 
 # We can now submit because we've configured.
 if(NOT DEFINED ENV{GITLAB_CI_EMULATION})
-  ctest_submit(PARTS Update)
-  ctest_submit(PARTS Configure)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+    ctest_submit(PARTS Update BUILD_ID build_id)
+    message(STATUS "Update submission build_id: ${build_id}")
+    ctest_submit(PARTS Configure BUILD_ID build_id)
+    message(STATUS "Configure submission build_id: ${build_id}")
+  else()
+    ctest_submit(PARTS Update)
+    ctest_submit(PARTS Configure)
+  endif()
 endif()
 
 if (configure_result)
diff --git a/.gitlab/ci/ctest_memcheck.cmake b/.gitlab/ci/ctest_memcheck.cmake
index 529a57817..abf80a34c 100644
--- a/.gitlab/ci/ctest_memcheck.cmake
+++ b/.gitlab/ci/ctest_memcheck.cmake
@@ -48,7 +48,8 @@ ctest_memcheck(
   EXCLUDE "${test_exclusions}"
   DEFECT_COUNT defects)
 
-ctest_submit(PARTS Memcheck)
+ctest_submit(PARTS Memcheck BUILD_ID build_id)
+  message(STATUS "Memcheck submission build_id: ${build_id}")
 
 if (defects)
   message(FATAL_ERROR "Found ${defects} memcheck defects")
diff --git a/.gitlab/ci/ctest_test.cmake b/.gitlab/ci/ctest_test.cmake
index 9cf46e975..4ff74a4a9 100644
--- a/.gitlab/ci/ctest_test.cmake
+++ b/.gitlab/ci/ctest_test.cmake
@@ -35,7 +35,8 @@ ctest_test(APPEND
   )
 
 if(NOT DEFINED ENV{GITLAB_CI_EMULATION})
-  ctest_submit(PARTS Test)
+  ctest_submit(PARTS Test BUILD_ID build_id)
+  message(STATUS "Test submission build_id: ${build_id}")
 endif()
 
 if (test_result)