diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml
index 70341aa3a821..47348b857219 100644
--- a/.azure-pipelines-gh-pages.yml
+++ b/.azure-pipelines-gh-pages.yml
@@ -11,7 +11,7 @@ jobs:
     variables:
       Codeql.SkipTaskAutoInjection: true
       skipComponentGovernanceDetection: true
-    container: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+    container: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
     pool:
       vmImage: ubuntu-20.04
 
diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml
index 536f5e1504b2..ede20f307000 100644
--- a/.azure-pipelines-templates/deploy_aci.yml
+++ b/.azure-pipelines-templates/deploy_aci.yml
@@ -51,7 +51,7 @@ jobs:
       - script: |
           set -ex
           docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY
-          docker pull $ACR_REGISTRY/ccf/ci:05-12-2023-snp-clang15
+          docker pull $ACR_REGISTRY/ccf/ci:07-12-2023-snp-clang15
           docker build -f docker/ccf_ci_built . --build-arg="base=$BASE_IMAGE" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD`
           docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD`
         name: build_ci_image
@@ -60,7 +60,7 @@ jobs:
           ACR_TOKEN_NAME: ci-push-token
           ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD)
           ACR_REGISTRY: ccfmsrc.azurecr.io
-          BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-snp-clang15
+          BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-snp-clang15
 
       - script: |
           set -ex
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index fc622842d311..9ce171f4f8c3 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -29,15 +29,15 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: snp
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-snp-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-sgx
       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_snp.yml b/.azure_pipelines_snp.yml
index f6f5d4d2bd51..5f1fb023f0d0 100644
--- a/.azure_pipelines_snp.yml
+++ b/.azure_pipelines_snp.yml
@@ -30,7 +30,7 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
       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/.daily.yml b/.daily.yml
index e0fa06e73b55..215846a2d313 100644
--- a/.daily.yml
+++ b/.daily.yml
@@ -25,15 +25,15 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
 
     - container: snp
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-snp-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-sgx
       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
 
 jobs:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9887d0a7d10b..928fb8e05966 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "CCF Development Environment",
-  "image": "ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15",
+  "image": "ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15",
   "runArgs": [],
   "extensions": [
     "eamodio.gitlens",
diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
index 8b58c3d426bf..211c0b873bb5 100644
--- a/.github/workflows/ci-checks.yml
+++ b/.github/workflows/ci-checks.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   checks:
     runs-on: ubuntu-latest
-    container: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+    container: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
 
     steps:
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
diff --git a/.github/workflows/tlaplus.yml b/.github/workflows/tlaplus.yml
index 545bdd714e5c..3a64c44acccc 100644
--- a/.github/workflows/tlaplus.yml
+++ b/.github/workflows/tlaplus.yml
@@ -14,7 +14,7 @@ jobs:
     name: Model Checking - Consistency
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.multi-thread.yml b/.multi-thread.yml
index 7c5c0c60a724..e1b9f7d3056a 100644
--- a/.multi-thread.yml
+++ b/.multi-thread.yml
@@ -16,7 +16,7 @@ pr:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-virtual-clang15
       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/.stress.yml b/.stress.yml
index d88a2c3b48ae..c4b88c08e139 100644
--- a/.stress.yml
+++ b/.stress.yml
@@ -20,7 +20,7 @@ schedules:
 resources:
   containers:
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:05-12-2023-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:07-12-2023-sgx
       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
 
 jobs:
diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built
index 927e47110949..0a173e7c6c48 100644
--- a/docker/ccf_ci_built
+++ b/docker/ccf_ci_built
@@ -4,7 +4,7 @@
 
 # Latest image as of this change
 ARG platform=sgx
-ARG base=ccfmsrc.azurecr.io/ccf/ci:05-12-2023-snp-clang-15
+ARG base=ccfmsrc.azurecr.io/ccf/ci:07-12-2023-snp-clang-15
 FROM ${base}
 
 # SSH. Note that this could (should) be done in the base ccf_ci image instead
diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py
index f2de3cfaca74..cac6c3135091 100644
--- a/scripts/azure_deployment/arm_aci.py
+++ b/scripts/azure_deployment/arm_aci.py
@@ -132,7 +132,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace:
         "--aci-image",
         help="The name of the image to deploy in the ACI",
         type=str,
-        default="ccfmsrc.azurecr.io/ccf/ci:05-12-2023-snp",
+        default="ccfmsrc.azurecr.io/ccf/ci:07-12-2023-snp",
     )
     parser.add_argument(
         "--aci-type",