diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 776253a653..3f5b034cfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc12, gcc13, clang14_debug, clang15]
+        target: [gcc12, gcc13, clang13, clang14_debug]
     runs-on: ubuntu-latest
     steps:
     - run: |
diff --git a/Dockerfile b/Dockerfile
index db4d9a18c8..2b52bc8736 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,15 @@ RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNI
     make -j 6 &&\
     ctest -T test --output-on-failure
 
+FROM ghcr.io/rse-ops/clang-ubuntu-22.04:llvm-13.0.0 AS clang13.0.0
+ENV GTEST_COLOR=1
+COPY . /home/raja/workspace
+WORKDIR /home/raja/workspace/build
+RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
+    cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j 6 &&\
+    ctest -T test --output-on-failure &&
+
 FROM ghcr.io/llnl/radiuss:ubuntu-22.04-clang-14 AS clang14_debug
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
@@ -38,13 +47,13 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug .. && \
 #    ctest -T test --output-on-failure
 
 ## TODO: Figure out why OpenMP does not work here....
-FROM ghcr.io/llnl/radiuss:clang-15-ubuntu-22.04 AS clang15
-ENV GTEST_COLOR=1
-COPY . /home/raja/workspace
-WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DENABLE_OPENMP=On .. && \
-    make -j 6 &&\
-    ctest -T test --output-on-failure
+#FROM ghcr.io/llnl/radiuss:clang-15-ubuntu-22.04 AS clang15
+#ENV GTEST_COLOR=1
+#COPY . /home/raja/workspace
+#WORKDIR /home/raja/workspace/build
+#RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DENABLE_OPENMP=On .. && \
+#    make -j 6 &&\
+#    ctest -T test --output-on-failure
 
 ##FROM ghcr.io/rse-ops/cuda:cuda-10.1.243-ubuntu-18.04 AS nvcc10.1.243
 ##ENV GTEST_COLOR=1