diff --git a/.gitlab/ci/ascent.yml b/.gitlab/ci/ascent.yml
index 0ba546b21..a9d2111f1 100644
--- a/.gitlab/ci/ascent.yml
+++ b/.gitlab/ci/ascent.yml
@@ -34,10 +34,14 @@
 
 build:ascent_gcc_cuda:
   stage: build
-  tags: [olcf, ascent, nobatch]
+  tags: [olcf, ascent, batch]
   extends:
     - .ascent_gcc_cuda
     - .run_ascent_ci
+    - .cmake_build_artifacts
+  variables:
+    SCHEDULER_PARAMETERS: -P CSC331 -W 2:00 -nnodes 1
+  timeout: 125 minutes
   before_script:
     - *setup_env_ecpci
     - ccache -z
@@ -48,12 +52,11 @@ build:ascent_gcc_cuda:
   script:
     - CTEST_MAX_PARALLELISM=8 cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake
     - ctest -VV -S .gitlab/ci/ctest_configure.cmake
-  artifacts:
-    expire_in: 24 hours
-    when: always
-    paths:
-      - build/
-  timeout: 10 minutes
+    - GITLAB_CI_EMULATION=1 jsrun -n1 -a1 -g1 -c42 ctest -VV -S .gitlab/ci/ctest_build.cmake
+  after_script:
+    - *setup_env_ecpci
+    - ccache -s
+    - ctest -VV -S .gitlab/ci/ctest_submit_build.cmake
 
 test:ascent_gcc_cuda:
   stage: test
@@ -67,17 +70,16 @@ test:ascent_gcc_cuda:
   dependencies:
     - build:ascent_gcc_cuda
   variables:
-    SCHEDULER_PARAMETERS: -P CSC331 -W 2:00 -nnodes 1 -alloc_flags gpudefault
+    CTEST_MAX_PARALLELISM: 4
     # We need this to skip ctest_submit from being run inside a jsrun job
     GITLAB_CI_EMULATION: 1
+    SCHEDULER_PARAMETERS: -P CSC331 -W 1:00 -nnodes 1 -alloc_flags gpudefault
+  timeout: 65 minutes
   before_script:
     - *setup_env_ecpci
   script:
-    - jsrun -n1 -a1 -g1 -c42 ctest -VV -S .gitlab/ci/ctest_build.cmake
-    - CTEST_MAX_PARALLELISM=4  jsrun -n1 -a1 -g1 -c8  ctest -VV -S .gitlab/ci/ctest_test.cmake
+    - cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake
+    - jsrun -n1 -a1 -g1 -c8  ctest -VV -S .gitlab/ci/ctest_test.cmake
   after_script:
     - *setup_env_ecpci
-    - ccache -s
-    - ctest -VV -S .gitlab/ci/ctest_submit_build.cmake
     - ctest -VV -S .gitlab/ci/ctest_submit_test.cmake
-  timeout: 120 minutes