diff --git a/.github/workflows/TMP_OFF/ubuntu-ci-containers-x86_64.yaml b/.github/workflows/TMP_OFF/ubuntu-ci-containers-x86_64.yaml
index 50c1171d6..fdea5cd0e 100644
--- a/.github/workflows/TMP_OFF/ubuntu-ci-containers-x86_64.yaml
+++ b/.github/workflows/TMP_OFF/ubuntu-ci-containers-x86_64.yaml
@@ -1,14 +1,15 @@
 name: ubuntu-ci-container-x86_64-build
 on:
   # Uncomment this to test for PRs (but do not submit)
-  # pull_request:
-  #  paths-ignore:
-  #    - 'configs/sites/**'
-  #    - 'doc/**'
-  #    - '**.md'
-  #    - '.github/ISSUE_TEMPLATE/*'
-  #    - '.gitignore'
-  
+  pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   schedule:
     - cron: '0 8 * * *'
   workflow_dispatch:
@@ -55,12 +56,9 @@ jobs:
           DOW=$(date +%u)
           # Monday is 1 ... Sunday is 7
           if [[ $DOW == 1 || $DOW == 4 ]]; then
-            export CONTAINER=${{ inputs.container || 'docker-ubuntu-clang-mpich' }}
-            export SPECS=${{ inputs.specs || 'jedi-ci' }}
-          elif [[ $DOW == 2 ]]; then
             export CONTAINER=${{ inputs.container || 'docker-ubuntu-gcc-openmpi' }}
             export SPECS=${{ inputs.specs || 'jedi-ci' }}
-          elif [[ $DOW == 5 ]]; then
+          elif [[ $DOW == 2 || $DOW == 5 ]]; then
             export CONTAINER=${{ inputs.container || 'docker-ubuntu-gcc11-openmpi' }}
             export SPECS=${{ inputs.specs || 'jedi-ci' }}
           elif [[ $DOW == 3 || $DOW == 6 ]]; then
diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml
index 49e02072e..ea51c0e56 100644
--- a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml
+++ b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml
@@ -1,6 +1,14 @@
 name: ubuntu-ci-c6a-x86_64-gnu-build
 on:
   pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
index a1d34a750..d1fe87a0d 100644
--- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
+++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
@@ -1,6 +1,14 @@
 name: ubuntu-ci-c6a-x86_64-oneapi-ifx-build
 on:
   pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
index 3c635adaa..384a62214 100644
--- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
+++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
@@ -1,6 +1,14 @@
 name: ubuntu-ci-c6a-x86_64-oneapi-build
 on:
   pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency:
diff --git a/util/nrl/batch_install.sh b/util/nrl/batch_install.sh
index b51d257db..65d91a85e 100755
--- a/util/nrl/batch_install.sh
+++ b/util/nrl/batch_install.sh
@@ -569,10 +569,13 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
       spack mirror create -a -d ${source_mirror_path}
     fi
 
-    # Update local cargo mirror if requested
+    # Update local cargo mirror if requested; this can be
+    # unreliable, therefore ignore errors and proceed ...
     if [[ "${update_cargo_mirror}" == "true"* ]]; then
+      set +e
       echo "Updating local cargo mirror ..."
       ./util/fetch_cargo_deps.py
+      set -e
     fi
 
     # Install the environment with the correct flags