diff --git a/.cirrus.yml b/.cirrus.yml
index 0f2cf440f..cca4822f9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -57,11 +57,8 @@ macos_arm64_task:
 
 linux_aarch64_task:
   name: Test (arm64 Linux)
-  compute_engine_instance:
-    image_project: cirrus-images
-    image: family/docker-builder-arm64
-    architecture: arm64
-    platform: linux
+  arm_container:
+    image: python:3.11
     cpu: 4
     memory: 4G
   env:
@@ -76,7 +73,4 @@ linux_aarch64_task:
     fingerprint_script:
       - echo $CIRRUS_OS
       - cat Cargo.lock
-  install_script:
-    - apt-get update
-    - apt-get install -y python3-dev python3-pip python-is-python3
   <<: *BUILD_AND_TEST
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 34936a4eb..27ac59d83 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -241,7 +241,7 @@ jobs:
       NODE_VERSION: 18
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         id: setup-python
         with:
           python-version: ${{ env.PYTHON_VERSION }}