diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd5631e2e..a7ae6980f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,17 +20,17 @@ jobs:
 
             BUILDSYSTEM_TOOLCHAIN=(
               "cmake arm-clang"
+              "cmake esp-idf"
               "make aarch64-gcc"
               "make arm-gcc"
               "make msp430-gcc"
               "make riscv-gcc"
               "make rx-gcc"
-              "cmake esp-idf"
             )
 
             # only build IAR if not forked PR, since IAR token is not shared
             if [ -z $CIRCLE_PR_USERNAME ]; then
-              BUILDSYSTEM_TOOLCHAIN+=("cmake arm-iar")
+              BUILDSYSTEM_TOOLCHAIN+=("make arm-iar")
             fi
 
             RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7"]'
diff --git a/.circleci/config2.yml b/.circleci/config2.yml
index c1f080556..d86a3f662 100644
--- a/.circleci/config2.yml
+++ b/.circleci/config2.yml
@@ -111,7 +111,6 @@ commands:
                 TOOLCHAIN_OPTION="--toolchain clang"
               elif [ << parameters.toolchain >> == arm-iar ]; then
                 TOOLCHAIN_OPTION="--toolchain iar"
-                echo IAR_LMS_CLOUD_URL=$IAR_LMS_CLOUD_URL
                 iccarm --version
               elif [ << parameters.toolchain >> == arm-gcc ]; then
                 TOOLCHAIN_OPTION="--toolchain gcc"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 547763bd8..f42499ef7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -119,7 +119,6 @@ jobs:
     runs-on: [self-hosted, Linux, X64, hifiphile]
     env:
       BUILD_ARGS: ${{ join(fromJSON(needs.set-matrix.outputs.json)['arm-iar'], ' ') }}
-      IAR_LMS_CLOUD_URL: ${{ vars.IAR_LMS_CLOUD_URL }}
       IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
     steps:
       - name: Clean workspace
@@ -130,7 +129,6 @@ jobs:
 
       - name: Toolchain version
         run: |
-          echo IAR_LMS_CLOUD_URL=$IAR_LMS_CLOUD_URL
           iccarm --version
 
       - name: Checkout TinyUSB
diff --git a/.github/workflows/hil_test.yml b/.github/workflows/hil_test.yml
index c890933ec..257416213 100644
--- a/.github/workflows/hil_test.yml
+++ b/.github/workflows/hil_test.yml
@@ -96,7 +96,6 @@ jobs:
     if: github.repository_owner == 'hathach' && github.event.pull_request.head.repo.fork == false
     runs-on: [self-hosted, Linux, X64, hifiphile]
     env:
-      IAR_LMS_CLOUD_URL: ${{ vars.IAR_LMS_CLOUD_URL }}
       IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
     steps:
       - name: Clean workspace
@@ -107,7 +106,6 @@ jobs:
 
       - name: Toolchain version
         run: |
-          echo IAR_LMS_CLOUD_URL=$IAR_LMS_CLOUD_URL
           iccarm --version
 
       - name: Checkout TinyUSB