diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d0b7c9c..3b8e2b7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,14 +24,14 @@ jobs:
       - name: "Log in to DockerHub"
         uses: docker/login-action@v2
         with:
-          registry: faasm.azurecr.io
-          username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
-          password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
+          registry: ghcr.io
+          username: faasm
+          password: ${{ secrets.GHCR_PAT }}
       - name: "Build and push cpython container"
         id: docker_build
         uses: docker/build-push-action@v3
         with:
           push: true
           context: .
-          tags: faasm.azurecr.io/cpython:${{ env.TAG_VERSION }}
+          tags: ghcr.io/faasm/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 e1cddca..a14dffb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,13 +20,10 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cpython:0.4.0
-      credentials:
-        username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
-        password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
+      image: ghcr.io/faasm/cpython:0.4.0
     steps:
       - name: "Fetch code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
         # We need to set the safe git directory as formatting relies on git-ls
@@ -44,16 +41,13 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm.azurecr.io/cpython:0.4.0
-      credentials:
-        username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
-        password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
+      image: ghcr.io/faasm/cpython:0.4.0
     services:
       redis:
         image: redis
     steps:
       - name: "Fetch code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: "Build Python function"
diff --git a/Dockerfile b/Dockerfile
index 191a1f4..45e8dde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM faasm.azurecr.io/cpp-sysroot:0.4.0
+FROM ghcr.io/faasm/cpp-sysroot:0.4.0
 ARG FAASM_PYTHON_VERSION
 
 SHELL ["/bin/bash", "-c"]
diff --git a/tasks/docker.py b/tasks/docker.py
index 50f33ec..5dc7701 100644
--- a/tasks/docker.py
+++ b/tasks/docker.py
@@ -1,5 +1,5 @@
 from faasmtools.docker import (
-    ACR_NAME,
+    CR_NAME,
     build_container,
     push_container,
 )
@@ -10,7 +10,7 @@
     get_version,
 )
 
-CONTAINER_IMAGE = "{}/cpython".format(ACR_NAME)
+CONTAINER_IMAGE = "{}/cpython".format(CR_NAME)
 DOCKERFILE = join(PROJ_ROOT, "Dockerfile")
 
 
diff --git a/third-party/cpp b/third-party/cpp
index d9fc3ac..258c560 160000
--- a/third-party/cpp
+++ b/third-party/cpp
@@ -1 +1 @@
-Subproject commit d9fc3acfaa96caebbe585389af79d5e7c0959c90
+Subproject commit 258c560a97c6b2772f688da77337f471017b22b7