diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index b9479fd63a..83e7e4f443 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -178,6 +178,7 @@ jobs:
         fi
 
         # Remove the container and the workspace to avoid any conflict with the next run.
+        echo github.workspace = ${{ github.workspace }}
         rm -rf ${{ github.workspace }}/*
         docker rm -f ${CONTAINER_NAME}
 
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 89cde1b5e5..c16b3af4e8 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -130,7 +130,7 @@ jobs:
             ENABLE_HYPRE: ON
             ENABLE_TRILINOS: OFF
             GCP_BUCKET: geosx/ubuntu22.04-gcc11
-            DOCKER_RUN_ARGS: "--cpus=8 --memory=128g"
+            DOCKER_RUN_ARGS: "--cpus=4 --memory=128g"
 
 
           # - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2)
@@ -191,7 +191,7 @@ jobs:
       ENABLE_TRILINOS: OFF
       GCP_BUCKET: geosx/integratedTests
       RUNS_ON: streak
-      DOCKER_RUN_ARGS: "--cpus=8 --memory=128g"
+      DOCKER_RUN_ARGS: "--cpus=4 --memory=128g"
 
   # If the 'ci: ready to be merged' PR label is found, the cuda jobs run immediately along side linux jobs.
   # Note: CUDA jobs should only be run if PR is ready to merge.
@@ -222,7 +222,7 @@ jobs:
             ENABLE_HYPRE: ON
             ENABLE_TRILINOS: OFF
             RUNS_ON: streak
-            DOCKER_RUN_ARGS: "--cpus=8 --memory=128g"
+            DOCKER_RUN_ARGS: "--cpus=4 --memory=128g"
 
 
           # - name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.89)
diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh
index aefca7ad8b..6fd1abf304 100755
--- a/scripts/ci_build_and_test_in_container.sh
+++ b/scripts/ci_build_and_test_in_container.sh
@@ -165,7 +165,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
   or_die apt-get install -y virtualenv python3-dev python-is-python3
   ATS_PYTHON_HOME=/tmp/run_integrated_tests_virtualenv
   or_die virtualenv ${ATS_PYTHON_HOME}
-  ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=4 --ats openmpi_maxprocs=4\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME}"
+  ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=$(nproc) --ats openmpi_maxprocs=$(nproc)\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME}"
 fi
 
 # The -DBLT_MPI_COMMAND_APPEND="--allow-run-as-root;--oversubscribe" option is added for OpenMPI.