diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index f403da8e30..ec3b587dfa 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -56,7 +56,7 @@ jobs:
           . /etc/profile
           echo "/opt/view/bin" >> $GITHUB_PATH
           echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" >> $GITHUB_ENV
-      # NOTE: checkout must occur *after* setting up environment for git tags to work
+      # NOTE: checkout must occur *after* setting up environment to use the right Git version
       # NOTE: depth must be enough to include the previous tag
       - name: Check out Celeritas
         uses: actions/checkout@v4
@@ -66,6 +66,7 @@ jobs:
       - name: Configure Celeritas
         run: |
           git config --global --add safe.directory ${PWD}
+          git fetch --tags
           ln -fs scripts/cmake-presets/ci-${{matrix.image}}.json CMakeUserPresets.json
           cmake --preset=${CMAKE_PRESET}
       - name: Build Celeritas
diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index e9abe6a1ec..42f4cbfcac 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -145,6 +145,8 @@ jobs:
           ccache -z
       - name: Configure Celeritas
         run: |
+          # NOTE: tags have issues, see https://github.com/actions/checkout/issues/2041
+          git fetch --tags
           ln -fs scripts/cmake-presets/ci-ubuntu-github.json CMakeUserPresets.json
           if [ "${{matrix.geant}}" == "11.0" ]; then
             # Test overriding of Geant4 environment variables