diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7ec9ffa..6dfb6760 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -255,7 +255,7 @@ jobs:
         if [ "${build_host_linux_x86_64}" == "y" ]; then
           MATRIX_HOSTS+='{
               "name": "linux-x86_64",
-              "runner": "zephyr-runner-v2-linux-x64-4xlarge",
+              "runner": "test-runner-v2-linux-x64-4xlarge",
               "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.2",
               "archive": "tar.xz"
             },'
@@ -291,7 +291,7 @@ jobs:
         if [ "${build_host_windows_x86_64}" == "y" ]; then
           MATRIX_HOSTS+='{
               "name": "windows-x86_64",
-              "runner": "zephyr-runner-v2-linux-x64-4xlarge",
+              "runner": "test-runner-v2-linux-x64-4xlarge",
               "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.2",
               "archive": "7z"
             },'
@@ -340,7 +340,7 @@ jobs:
         if [ "${build_host_linux_x86_64}" == "y" ]; then
           MATRIX_TESTENVS+='{
               "name": "ubuntu-20.04-x86_64",
-              "runner": "zephyr-runner-v2-linux-x64-4xlarge",
+              "runner": "test-runner-v2-linux-x64-4xlarge",
               "container": "ghcr.io/zephyrproject-rtos/ci:master",
               "bundle-host": "linux-x86_64",
               "bundle-archive": "tar.xz"
@@ -1547,7 +1547,7 @@ jobs:
               PLATFORM_ARGS+="-p qemu_cortex_m0 "
               PLATFORM_ARGS+="-p mps2/an385 "
               PLATFORM_ARGS+="-p mps2/an521/cpu0 "
-              PLATFORM_ARGS+="-p mps3/an547 "
+              PLATFORM_ARGS+="-p mps3/corstone300/an547 "
               ;;
             # TODO: Release the microblaze arch source in a public repo
             # microblazeel-zephyr-elf)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b4d902ea..6a673a9b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
     name: Release
     needs: [ ci ]
     runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+      group: test-runner-v2-linux-x64-4xlarge
 
     steps:
     - name: Set up build environment