diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index efb0d9d..da92a3d 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -22,18 +22,14 @@ jobs:
         # BRANCH is the actual branch/tag in the github repo
         # DOCKERHUB_TAGs are the tags to use for the REPO when pushing to dockerhub
         # POKYBRANCH is the branch of poky selected by toaster to use during tests.
-        - repo: crops/toaster-dunfell
-          branch: dunfell
-          dockerhub_tag: latest
-          pokybranch: dunfell
         - repo: crops/toaster-kirkstone
           branch: kirkstone
           dockerhub_tag: latest
           pokybranch: kirkstone
-        - repo: crops/toaster-mickledore
-          branch: mickledore
+        - repo: crops/toaster-scarthgap
+          branch: scarthgap
           dockerhub_tag: latest
-          pokybranch: mickledore
+          pokybranch: scarthgap
         - repo: crops/toaster-master
           branch: master
           dockerhub_tag: latest
@@ -58,7 +54,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8