diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e928fafd7f..7fc58687e2 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -95,7 +95,7 @@ jobs:
       # Disable conda upload for now, once we have morpheus packages in conda forge set the value to
       # !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || ''
       conda_upload_label: ""
-      container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240221
-      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240221
+      container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240524
+      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240524
     secrets:
       NGC_API_KEY: ${{ secrets.NGC_API_KEY }}
diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile
index 57cc66f666..df34c327d0 100644
--- a/ci/runner/Dockerfile
+++ b/ci/runner/Dockerfile
@@ -37,7 +37,6 @@ SHELL ["/bin/bash",  "-c"]
 # Create conda environment
 COPY ./dependencies.yaml /tmp/conda/
 
-
 # ============ build ==================
 FROM base as build
 
@@ -56,6 +55,20 @@ RUN rapids-dependency-file-generator \
     conda clean -afy && \
     rm -rf /tmp/conda
 
+ENV MORPHEUS_SUPPORT_DOCA=ON
+
+COPY ./docker/optional_deps/doca.sh /tmp/doca/
+
+RUN apt update && \
+    DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
+    apt install --no-install-recommends -y \
+        build-essential \
+        libtool \
+        automake && \
+    apt clean && \
+    /tmp/doca/doca.sh /tmp/doca && \
+    rm -rf /tmp/doca
+
 # ============ test ==================
 FROM base as test
 
diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh
index a4269828c2..5f50779726 100644
--- a/ci/scripts/github/common.sh
+++ b/ci/scripts/github/common.sh
@@ -82,6 +82,10 @@ fi
 export CMAKE_BUILD_ALL_FEATURES="${_FLAGS[@]}"
 unset _FLAGS
 
+if [[ ${MORPHEUS_SUPPORT_DOCA} == @(TRUE|ON) ]]; then
+    export CMAKE_BUILD_ALL_FEATURES="${CMAKE_BUILD_ALL_FEATURES} -DMORPHEUS_SUPPORT_DOCA=ON"
+fi
+
 export FETCH_STATUS=0
 
 print_env_vars
diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh
index 979fd07e23..444d4a5ebb 100755
--- a/ci/scripts/run_ci_local.sh
+++ b/ci/scripts/run_ci_local.sh
@@ -58,7 +58,7 @@ GIT_BRANCH=$(git branch --show-current)
 GIT_COMMIT=$(git log -n 1 --pretty=format:%H)
 
 LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp}
-CONTAINER_VER=${CONTAINER_VER:-240221}
+CONTAINER_VER=${CONTAINER_VER:-240524}
 CUDA_VER=${CUDA_VER:-12.1}
 DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}