diff --git a/.gitlab/ci/frontier.yml b/.gitlab/ci/frontier.yml
index 936f6283f..cab284450 100644
--- a/.gitlab/ci/frontier.yml
+++ b/.gitlab/ci/frontier.yml
@@ -37,6 +37,7 @@
     # The user default module list should not exist
     # craype;rocm;gcc should be loaded first
     JOB_MODULES: >-
+      DefApps
       craype-accel-amd-gfx90a
       gcc/12
       cmake
@@ -49,6 +50,20 @@
     VTKM_SETTINGS: kokkos+hip+gfx90a+frontier+ccache+no_rendering
   interruptible: true
 
+setup_modules:
+  stage: .pre
+  extends:
+    - .run_frontier_ci
+  tags: [frontier, shell]
+  variables:
+    CUSTOM_CI_BUILDS_DIR: "/lustre/orion/ums033/scratch/ums033_auser/ci/vtk-m/runtime"
+    OLCF_SERVICE_ACCOUNT: "ums033_auser"
+    GIT_STRATEGY: none
+  script:
+    - module load DefApps
+    - module load git-lfs
+    - module save
+
 .setup_env_ecpci: &setup_env_ecpci |
   module purge
   module load ${JOB_MODULES}
@@ -69,11 +84,6 @@ build:frontier_gcc_hip:
     - ccache -z
     - ccache -s
     - .gitlab/ci/config/kokkos.sh "$CI_BUILDS_DIR" "3.7.01" $KOKKOS_OPTS
-
-    - git remote add lfs https://gitlab.kitware.com/vtk/vtk-m.git
-    - git fetch lfs
-    - git-lfs install
-    - git-lfs pull lfs
   script:
     - cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake
     - ctest -VV -S .gitlab/ci/ctest_configure.cmake