diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 20e80fc4fbc..ca696c0f844 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -175,7 +175,7 @@ jobs:
 
           pytest -vvv --cov=CIME --machine docker --no-fortran-run --no-teardown CIME/tests/test_sys*
       - uses: mxschmitt/action-tmate@v3
-        if: ${{ !always() }}
+        if: ${{ always() }}
         with:
           limit-access-to-actor: true
       - name: Create testing log archive
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 11d33a1cf8b..af199ba5c04 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -72,14 +72,15 @@ if [[ "${SKIP_MODEL_SETUP}" == "false" ]]; then
         # fix E3SM gitmodules
         fix_gitmodules "${PWD}"
 
-        git status
-
         # checkout submodules
         git submodule update --init "${GIT_SUBMODULE_FLAGS}"
 
         # fix mct arflags flags
         fix_mct_arflags "${SRC_PATH}/E3SM/externals/mct"
 
+        git status
+        git submodule status
+
         pushd cime
     elif [[ "${CIME_MODEL}" == "cesm" ]]; then
         echo "Setting up CESM"
@@ -93,6 +94,7 @@ if [[ "${SKIP_MODEL_SETUP}" == "false" ]]; then
         ./bin/git-fleximod update
 
         git status
+        git submodule status
 
         pushd cime
     fi
@@ -114,6 +116,7 @@ if [[ "$(to_lowercase SKIP_CIME_UPDATE)" == "false" ]]; then
 fi
 
 git status
+git submodule status
 
 if [[ "${CIME_MODEL}" == "e3sm" ]]; then
     # link v2 config_machines