diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ff0a1d6..d0b7c9c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,13 +24,14 @@ jobs:
       - name: "Log in to DockerHub"
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          registry: faasm.azurecr.io
+          username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
+          password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       - name: "Build and push cpython container"
         id: docker_build
         uses: docker/build-push-action@v3
         with:
           push: true
           context: .
-          tags: faasm/cpython:${{ env.TAG_VERSION }}
+          tags: faasm.azurecr.io/cpython:${{ env.TAG_VERSION }}
           build-args: FAASM_PYTHON_VERSION=${{ env.TAG_VERSION }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9140879..1429717 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,7 +20,10 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm/cpython:0.2.4
+      image: faasm.azurecr.io/cpython:0.2.5
+      credentials:
+        username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
+        password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     steps:
       - name: "Fetch code"
         uses: actions/checkout@v3
@@ -41,7 +44,10 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm/cpython:0.2.4
+      image: faasm.azurecr.io/cpython:0.2.5
+      credentials:
+        username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
+        password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
         image: redis
diff --git a/Dockerfile b/Dockerfile
index 18e7384..a3fba6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM faasm/cpp-sysroot:0.2.3
+FROM faasm.azurecr.io/cpp-sysroot:0.2.4
 ARG FAASM_PYTHON_VERSION
 
 SHELL ["/bin/bash", "-c"]
diff --git a/VERSION b/VERSION
index abd4105..3a4036f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.4
+0.2.5
diff --git a/tasks/docker.py b/tasks/docker.py
index 995f6ed..50f33ec 100644
--- a/tasks/docker.py
+++ b/tasks/docker.py
@@ -1,17 +1,16 @@
-from invoke import task
-from os.path import join
-
 from faasmtools.docker import (
+    ACR_NAME,
     build_container,
     push_container,
 )
-
+from invoke import task
+from os.path import join
 from tasks.env import (
     PROJ_ROOT,
     get_version,
 )
 
-CONTAINER_IMAGE = "faasm/cpython"
+CONTAINER_IMAGE = "{}/cpython".format(ACR_NAME)
 DOCKERFILE = join(PROJ_ROOT, "Dockerfile")
 
 
diff --git a/third-party/cpp b/third-party/cpp
index 3f590b9..b556c29 160000
--- a/third-party/cpp
+++ b/third-party/cpp
@@ -1 +1 @@
-Subproject commit 3f590b9fcc17f7f3716458bc7bbd93eba77a78b4
+Subproject commit b556c29b46869d0f07d55c53b1b6819e6c4c72f1