diff --git a/.github/workflows/makecode.yml b/.github/workflows/makecode.yml
index 7ba4d90c..597ed652 100644
--- a/.github/workflows/makecode.yml
+++ b/.github/workflows/makecode.yml
@@ -85,6 +85,15 @@ jobs:
               f.write(json.dumps(pxt_target, indent=4))
           EOF
           git diff pxtarget.json
+      # https://docs.docker.com/engine/deprecated/#pushing-and-pulling-with-image-manifest-v2-schema-1
+      # https://stackoverflow.com/a/51357915/775259
+      - name: Workaround for issue with pext/yotta:latest docker image type being deprecated
+        run: |
+          sudo mkdir -p /etc/systemd/system/docker.service.d
+          sudo echo "[Service]" > /etc/systemd/system/docker.service.d/docker-service-override.conf
+          sudo echo 'Environment="DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1"' >> /etc/systemd/system/docker.service.d/docker-service-override.conf
+          systemctl daemon-reload
+          systemctl restart docker
       - name: Build MakeCode targets
         # Because pxt runs docker with "--user build" it doesn't have write access to some mounted files,
         # so we need to force all files created by the pxt cli to have write/execute rights for everyone