diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c702b38f7..08bd44940 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
         working-directory: ./Exec/RegTests/PMF
         run: |
           egrep "warning:|error:" build-output.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest|GNUmakefile" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials|GNUmakefile" \
             | egrep -v "ld: warning:" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
           cat warnings.txt
@@ -99,7 +99,7 @@ jobs:
         working-directory: ./Exec/RegTests/EB-C10
         run: |
           egrep "warning:|error:" build-output.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest|GNUmakefile" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials|GNUmakefile" \
             | egrep -v "ld: warning:" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
           cat warnings.txt
@@ -124,7 +124,7 @@ jobs:
         working-directory: ./Exec/RegTests/TG
         run: |
           egrep "warning:|error:" build-output.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest|GNUmakefile" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials|GNUmakefile" \
             | egrep -v "ld: warning:" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
           cat warnings.txt
@@ -146,7 +146,7 @@ jobs:
         working-directory: ./Exec/RegTests/Soot-Flame
         run: |
           egrep "warning:|error:" build-output.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest|GNUmakefile|Submodules/PeleMP" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials|GNUmakefile|Submodules/PeleMP" \
             | egrep -v "Submodules/PelePhysics/Support/Mechanism/Models" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
           cat warnings.txt
@@ -168,7 +168,7 @@ jobs:
         working-directory: ./Exec/RegTests/Spray-Conv
         run: |
           egrep "warning:|error:" build-output.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest|GNUmakefile|Submodules/PeleMP" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials|GNUmakefile|Submodules/PeleMP" \
             | egrep -v "Submodules/PelePhysics/Support/Mechanism/Models" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
           cat warnings.txt
@@ -293,7 +293,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/problem-matchers/gcc.json"
           egrep "warning:|error:" ${{runner.workspace}}/build-output.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials" \
             | egrep -v "ld: warning:" | egrep -v "lto-wrapper: warning:" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > ${{runner.workspace}}/build-output-warnings.txt
           cat ${{runner.workspace}}/build-output-warnings.txt
@@ -394,12 +394,12 @@ jobs:
         run: |
           curl -O https://repo.radeon.com/rocm/rocm.gpg.key
           sudo apt-key add rocm.gpg.key
-          echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ ubuntu main' \
+          echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/5.6.1 ubuntu main' \
               | sudo tee /etc/apt/sources.list.d/rocm.list
           echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \
               | sudo tee -a /etc/profile.d/rocm.sh
           sudo apt-get update
-          sudo apt-get install -y rocm-dev roctracer-dev rocprofiler-dev rocrand-dev rocprim-dev rocm-libs
+          sudo apt-get install -y rocm-dev rocrand-dev rocprim-dev
       - name: Install Ccache
         run: |
           wget https://github.com/ccache/ccache/releases/download/v4.8/ccache-4.8-linux-x86_64.tar.xz
@@ -570,7 +570,7 @@ jobs:
           #set -eu -o pipefail
           cmake --build . --parallel ${{env.NPROCS}} 2>&1 | tee -a clang-tidy-full-report.txt
           egrep "warning:|error:" clang-tidy-full-report.txt \
-            | egrep -v "Submodules/AMReX|Submodules/sundials|Submodules/GoogleTest" \
+            | egrep -v "Submodules/AMReX|Submodules/sundials" \
             | egrep -v "ld: warning:" | sort | uniq \
             | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > clang-tidy-warnings.txt
       - name: Full report
diff --git a/Submodules/AMReX b/Submodules/AMReX
index f3598d2f7..b2052f2d2 160000
--- a/Submodules/AMReX
+++ b/Submodules/AMReX
@@ -1 +1 @@
-Subproject commit f3598d2f7b6beca566e19d918b6e9976f8ed5a88
+Subproject commit b2052f2d2e5ce44317450ba13de705a3e01ef0ea
diff --git a/Submodules/GoogleTest b/Submodules/GoogleTest
deleted file mode 160000
index 6c58c11d5..000000000
--- a/Submodules/GoogleTest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6c58c11d5497b6ee1df3cb400ce30deb72fc28c0
diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics
index 90594b487..0086460e2 160000
--- a/Submodules/PelePhysics
+++ b/Submodules/PelePhysics
@@ -1 +1 @@
-Subproject commit 90594b487b244d651921f415de3a7c40d6d94c06
+Subproject commit 0086460e20cfb12b62ded008634fbd8af80bef2e
diff --git a/Submodules/sundials b/Submodules/sundials
index 34d21afdb..a4553b502 160000
--- a/Submodules/sundials
+++ b/Submodules/sundials
@@ -1 +1 @@
-Subproject commit 34d21afdb5780947223b88a46201fbe8191af48c
+Subproject commit a4553b5021b7089b036f1edcfdd9457a7764d5a0