diff --git a/.github/workflows/ci-short.yml b/.github/workflows/ci-short.yml
index e21612cc221c..90c357986780 100644
--- a/.github/workflows/ci-short.yml
+++ b/.github/workflows/ci-short.yml
@@ -178,7 +178,7 @@ jobs:
     container:
       image: ghcr.io/parthenon-hpc-lab/cuda11.6-mpi-hdf5-ascent
       # Map to local user id on CI  machine to allow writing to build cache
-      options: --user 1000 --runtime=nvidia
+      options: --user 1000 --gpus all
     env:
       CMAKE_GENERATOR: Ninja
       CMAKE_BUILD_PARALLEL_LEVEL: 8 # num threads for build
diff --git a/cmake/machinecfg/GitHubActions.cmake b/cmake/machinecfg/GitHubActions.cmake
index 4457b93132f6..b539ec4fe44d 100644
--- a/cmake/machinecfg/GitHubActions.cmake
+++ b/cmake/machinecfg/GitHubActions.cmake
@@ -19,7 +19,7 @@ message(STATUS "Loading machine configuration for GitHub Actions CI. ")
 
 # common options
 set(NUM_MPI_PROC_TESTING "2" CACHE STRING "CI runs tests with 2 MPI ranks")
-set(Kokkos_ARCH_ZEN3 ON CACHE BOOL "Enable Zen3")
+set(Kokkos_ARCH_ZEN2 ON CACHE BOOL "Enable Zen2")
 
 set(MACHINE_CXX_FLAGS "")
 if (${MACHINE_VARIANT} MATCHES "cuda")