diff --git a/.gitlab/ci/ctest_test.cmake b/.gitlab/ci/ctest_test.cmake
index 956856254645505358c179468002344d21a79fe1..725cd7b37b9bf6e9eea9dc95eae7c9f0e0c1c951 100644
--- a/.gitlab/ci/ctest_test.cmake
+++ b/.gitlab/ci/ctest_test.cmake
@@ -36,7 +36,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
   set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/junit.xml")
 endif()
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.17 AND DEFINED CTEST_REPEAT_UNTIL_PASS)
   set(repeat_args REPEAT "UNTIL_PASS:${CTEST_REPEAT_UNTIL_PASS}")
 endif()
 
diff --git a/.gitlab/ci/frontier.yml b/.gitlab/ci/frontier.yml
index 031fbbeee2aec5e6ab9b33b3cf972acfb70fd130..f17837d7257999fad15603cee85cbaeb52c654bd 100644
--- a/.gitlab/ci/frontier.yml
+++ b/.gitlab/ci/frontier.yml
@@ -10,6 +10,11 @@
 ##
 ##=============================================================================
 
+default:
+  id_tokens:
+    OLCF_ID_TOKEN:
+      aud: https://code.olcf.ornl.gov
+
 # Ad-hoc build that runs in the ECP Hardware, concretely in OLCF Spock.
 .frontier_gcc_hip:
   variables:
@@ -45,7 +50,6 @@
       git
       git-lfs
       ninja
-      zstd
     OLCF_SERVICE_ACCOUNT: "ums033_auser"
     VTKM_SETTINGS: kokkos+hip+gfx90a+frontier+ccache+no_rendering
   interruptible: true