diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml
index 6b3c55e899..fce4026860 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:15-03-2024-virtual-clang15
+    container: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-virtual-clang15
     pool:
       vmImage: ubuntu-20.04
 
diff --git a/.azure-pipelines-model-checking.yml b/.azure-pipelines-model-checking.yml
index 25cda5f010..63e3914caa 100644
--- a/.azure-pipelines-model-checking.yml
+++ b/.azure-pipelines-model-checking.yml
@@ -21,7 +21,7 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
 
 jobs:
diff --git a/.azure-pipelines-release.yml b/.azure-pipelines-release.yml
index 078ba9046b..b9283f3ec4 100644
--- a/.azure-pipelines-release.yml
+++ b/.azure-pipelines-release.yml
@@ -8,15 +8,15 @@ pr: none
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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:15-03-2024-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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:15-03-2024-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml
index f417cf8621..79a01ad5ec 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:15-03-2024-snp-clang15
+          docker pull $ACR_REGISTRY/ccf/ci:2024-03-21-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:15-03-2024-snp-clang15
+          BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-snp-clang15
 
       - script: |
           set -ex
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 5a7f1a46df..3cc9a6fe8f 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -30,15 +30,15 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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:15-03-2024-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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:15-03-2024-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 f33f36b8ff..2209c96dac 100644
--- a/.azure_pipelines_snp.yml
+++ b/.azure_pipelines_snp.yml
@@ -32,7 +32,7 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 348425e260..6c734139c3 100644
--- a/.daily.yml
+++ b/.daily.yml
@@ -27,15 +27,15 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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:15-03-2024-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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:15-03-2024-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 21238c0792..9d4ea86207 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "CCF Development Environment",
-  "image": "ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15",
+  "image": "ccfmsrc.azurecr.io/ccf/ci:2024-03-21-virtual-clang15",
   "runArgs": [],
   "extensions": [
     "eamodio.gitlens",
diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
index 813c2b9999..be2ac6e109 100644
--- a/.github/workflows/ci-checks.yml
+++ b/.github/workflows/ci-checks.yml
@@ -11,7 +11,7 @@ permissions: read-all
 jobs:
   checks:
     runs-on: ubuntu-latest
-    container: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+    container: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 ae3dad6eff..a5ba210db5 100644
--- a/.github/workflows/tlaplus.yml
+++ b/.github/workflows/tlaplus.yml
@@ -16,7 +16,7 @@ jobs:
     name: Model Checking - Consistency
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-virtual-clang15
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.multi-thread.yml b/.multi-thread.yml
index 8a84b7cea9..cd09440093 100644
--- a/.multi-thread.yml
+++ b/.multi-thread.yml
@@ -20,7 +20,7 @@ pr:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 54da8a94c6..00a9a068ca 100644
--- a/.stress.yml
+++ b/.stress.yml
@@ -24,7 +24,7 @@ schedules:
 resources:
   containers:
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:15-03-2024-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 b64dda5798..023c7e4250 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:15-03-2024-snp-clang-15
+ARG base=ccfmsrc.azurecr.io/ccf/ci:2024-03-21-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 2c51a064c9..8a4c9a32bf 100644
--- a/scripts/azure_deployment/arm_aci.py
+++ b/scripts/azure_deployment/arm_aci.py
@@ -133,7 +133,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:15-03-2024-snp",
+        default="ccfmsrc.azurecr.io/ccf/ci:2024-03-21-snp",
     )
     parser.add_argument(
         "--aci-type",