diff --git a/.azure-pipelines-release.yml b/.azure-pipelines-release.yml
index 1c74d33267a7..7e7a9d2083dd 100644
--- a/.azure-pipelines-release.yml
+++ b/.azure-pipelines-release.yml
@@ -8,15 +8,15 @@ pr: none
 resources:
   containers:
     - container: virtual
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: snp
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ghcr.io/microsoft/ccf/ci/sgx:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/sgx:build-05-12-2024
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro
 
 variables:
diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml
index 1784a466021e..16354d3af7c2 100644
--- a/.azure-pipelines-templates/deploy_aci.yml
+++ b/.azure-pipelines-templates/deploy_aci.yml
@@ -50,7 +50,7 @@ jobs:
         env:
           ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
           ACR_REGISTRY: ccfmsrc.azurecr.io
-          BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+          BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
       - script: |
           set -ex
diff --git a/.azure_pipelines_snp.yml b/.azure_pipelines_snp.yml
index b46f4d0a5389..76aec28d7c6f 100644
--- a/.azure_pipelines_snp.yml
+++ b/.azure_pipelines_snp.yml
@@ -22,7 +22,7 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
 jobs:
diff --git a/.github/workflows/bencher.yml b/.github/workflows/bencher.yml
index 5cfc20a46e9e..e59982521ea0 100644
--- a/.github/workflows/bencher.yml
+++ b/.github/workflows/bencher.yml
@@ -11,7 +11,7 @@ jobs:
     name: Continuous Benchmarking with Bencher
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6bd99193da04..5a4582912b14 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
   checks:
     name: "Format and License Checks"
     runs-on: ubuntu-latest
-    container: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+    container: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -48,7 +48,7 @@ jobs:
             options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro
     runs-on: ${{ matrix.platform.nodes }}
     container:
-      image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
       options: ${{ matrix.platform.options }}
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bdf22fd91bd9..eeb16a0f71b5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ jobs:
     # Insufficient space to run on public runner, so use custom pool
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
       options: --user root
 
     permissions:
diff --git a/.github/workflows/long-test.yml b/.github/workflows/long-test.yml
index 9642da08e851..2ff17f50302a 100644
--- a/.github/workflows/long-test.yml
+++ b/.github/workflows/long-test.yml
@@ -10,7 +10,7 @@ jobs:
     name: "Scan build"
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
     name: ASAN
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
     name: TSAN
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ec975eae95b0..3c75c2a4ed11 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -80,7 +80,7 @@ jobs:
             cmake_options: -DLVI_MITIGATIONS=ON
     runs-on: ${{ matrix.platform.nodes }}
     container:
-      image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
       options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro ${{ matrix.platform.container_options }}"
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/tlaplus.yml b/.github/workflows/tlaplus.yml
index 6644bc7204f9..09007db6d73f 100644
--- a/.github/workflows/tlaplus.yml
+++ b/.github/workflows/tlaplus.yml
@@ -23,7 +23,7 @@ jobs:
     name: Model Checking - Consistency
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
@@ -120,7 +120,7 @@ jobs:
     name: Model Checking - Consensus
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
@@ -154,7 +154,7 @@ jobs:
     name: Model Checking With Reconfig - Consensus
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
@@ -209,7 +209,7 @@ jobs:
     name: Trace Validation - Consensus
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 849811ab7fc1..a5f9426b37e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [5.0.11]
+
+[5.0.11]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.11
+
+### Dependencies
+
+- Updated Open Enclave from 0.19.7 to 0.19.8 (#6685).
+- Updated Intel PSW from 2.20.100 to 2.25.100 (#6685).
+
 ## [5.0.10]
 
 [5.0.10]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.10
diff --git a/cmake/cpack_settings.cmake b/cmake/cpack_settings.cmake
index a56dff24babd..8fe6c2d2b97e 100644
--- a/cmake/cpack_settings.cmake
+++ b/cmake/cpack_settings.cmake
@@ -24,7 +24,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}")
 set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1f)")
 set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})
 
-set(OE_VERSION "0.19.7")
+set(OE_VERSION "0.19.8")
 if(COMPILE_TARGET STREQUAL "sgx")
   list(APPEND CCF_DEB_DEPENDENCIES
        "libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})"
diff --git a/cmake/open_enclave.cmake b/cmake/open_enclave.cmake
index 9ccb11b38dfa..861c29997111 100644
--- a/cmake/open_enclave.cmake
+++ b/cmake/open_enclave.cmake
@@ -13,7 +13,7 @@ if(REQUIRE_OPENENCLAVE)
   endif()
 
   # Find OpenEnclave package
-  find_package(OpenEnclave 0.19.7 CONFIG REQUIRED)
+  find_package(OpenEnclave 0.19.8 CONFIG REQUIRED)
 
   option(USE_OPENSSL_3 "Use OpenSSL 3.x for Open Enclave builds" ON)
   if(USE_OPENSSL_3)
diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built
index c015342af416..5bfb3d872175 100644
--- a/docker/ccf_ci_built
+++ b/docker/ccf_ci_built
@@ -3,7 +3,7 @@
 # Also contains CCF source and build directory
 
 # Latest image as of this change
-ARG base=ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+ARG base=ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
 FROM ${base}
 
 # SSH. Note that this could (should) be done in the base ccf_ci image instead