diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml
index 27119203fcb..287ab4ba481 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-14-01-2025
+          BASE_IMAGE: mcr.microsoft.com/azurelinux/base/core:3.0
 
       - script: |
           set -ex
@@ -156,11 +156,11 @@ jobs:
           python3 -m venv ./scripts/azure_deployment/.env
           source ./scripts/azure_deployment/.env/bin/activate
           pip install -r ./scripts/azure_deployment/requirements.txt
-          python3 scripts/azure_deployment/arm_template.py remove aci \
-          --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \
-          --resource-group ccf-aci \
-          --aci-type dynamic-agent \
-          --deployment-name ci-$(Build.BuildNumber)
+          # python3 scripts/azure_deployment/arm_template.py remove aci \
+          # --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \
+          # --resource-group ccf-aci \
+          # --aci-type dynamic-agent \
+          # --deployment-name ci-$(Build.BuildNumber)
         name: cleanup_primary_aci
         displayName: "Delete the primary ACIs and Azure Deployments"
         continueOnError: true
diff --git a/.snpcc_canary b/.snpcc_canary
index bc1c6f559e2..bbb81ddb931 100644
--- a/.snpcc_canary
+++ b/.snpcc_canary
@@ -4,4 +4,22 @@
 /-xXx--//-----x=x--/-xXx--/---x---->>>--/
 ...
 /\/\d(-_-)b/\/\
-----vmpl---
\ No newline at end of file
+----vmpl---
+
+                   ,~.
+                ,-'__ `-,
+               {,-'  `. }              ,')
+              ,( a )   `-.__         ,',')~,
+            <==.) (         `-.__,==' ' ' '}
+               (   )                      /)
+                `-'\   ,                    )
+                    |  \        `~.        /
+                    \   `._        \      /
+                     \     `._____,'    ,'
+                      `-.             ,'
+                         `-._     _,-'
+                             77jj'
+                            //_||
+                         __//--'/`          hjw
+                       ,--'/`  '
+                          '
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b31cfc08066..248dd602cbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ endfunction()
 option(PROFILE_TESTS "Profile tests" OFF)
 
 if("$ENV{CI}" STREQUAL "")
-  set(PYTHON unbuffer python3)
+  set(PYTHON python3)
 else()
   set(PYTHON python3)
 endif()
diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built
index 254431d9bee..74e8b9b4d43 100644
--- a/docker/ccf_ci_built
+++ b/docker/ccf_ci_built
@@ -3,13 +3,13 @@
 # Also contains CCF source and build directory
 
 # Latest image as of this change
-ARG base=ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
+ARG base=mcr.microsoft.com/azurelinux/base/core:3.0
 FROM ${base}
 
 # SSH. Note that this could (should) be done in the base ccf_ci image instead
 # if we wanted to build this image faster
-RUN apt update \
-    && apt install -y openssh-server \
+RUN tdnf -y update \
+    && tdnf -y install openssh-server \
     && sed -i "s/.*PubkeyAuthentication.*/PubkeyAuthentication yes/g" /etc/ssh/sshd_config \
     && sed -i "s/.*PasswordAuthentication.*/PasswordAuthentication no/g" /etc/ssh/sshd_config \
     && mkdir -p /run/sshd # To avoid "Missing privilege separation directory: /run/sshd" error
@@ -24,10 +24,16 @@ RUN useradd -m $user \
 # Copy CCF source and build
 RUN mkdir /CCF
 COPY . /CCF/
+RUN gpg --import /etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY \
+    && tdnf -y update \
+    && tdnf -y install ca-certificates git \
+    && /CCF/scripts/./install-azure-linux-deps.sh
 RUN mkdir /CCF/build \
     && cd /CCF/build \
-    && cmake -GNinja -DCOMPILE_TARGET=snp .. \
+    && CC=`which clang` CXX=`which clang++` cmake -GNinja -DCOMPILE_TARGET=snp .. \
     && ninja \ 
     && chmod -R 777 /CCF
 
+RUN ssh-keygen -A
+
 CMD ["/usr/sbin/sshd", "-D"]