diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 662b1e3882..1275ede581 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -90,6 +90,7 @@ jobs:
       run: |
         echo "::add-matcher::.github/problem-matchers/gcc.json"
         ccache -z
+        set -eu -o pipefail
         cmake --build ${{runner.workspace}}/build-ci-${{matrix.build_type}} --parallel ${{env.NPROCS}} 2>&1 | \
           tee -a build-output.txt
     - name: Ccache Report
@@ -347,6 +348,7 @@ jobs:
       - name: Check
         working-directory: ${{runner.workspace}}/build-clang-tidy
         run: |
+          #set -eu -o pipefail
           cmake --build . --parallel ${{env.NPROCS}} 2>&1 | tee -a clang-tidy-full-report.txt
           cat clang-tidy-full-report.txt | grep "warning:" | grep -v "submods" | sort | uniq | \
             awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > clang-tidy-ci-report.txt
diff --git a/submods/AMReX-Hydro b/submods/AMReX-Hydro
index 5cb0f33394..bc4e5f64c9 160000
--- a/submods/AMReX-Hydro
+++ b/submods/AMReX-Hydro
@@ -1 +1 @@
-Subproject commit 5cb0f33394a3e3c267226c7f84f78dc7efaedd39
+Subproject commit bc4e5f64c9ac3072793ebf426b422be91231652c
diff --git a/submods/amrex b/submods/amrex
index cf8d9f8e23..346a4d1c91 160000
--- a/submods/amrex
+++ b/submods/amrex
@@ -1 +1 @@
-Subproject commit cf8d9f8e233be2ac68aeb65a95e992adfb483939
+Subproject commit 346a4d1c915f2960cc0b0cbd2383cc341da4f56c