diff --git a/.github/workflows/build-esp.yml b/.github/workflows/build-esp.yml
index 0def652e..43a216c0 100644
--- a/.github/workflows/build-esp.yml
+++ b/.github/workflows/build-esp.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
           tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
-          export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
+          export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
           echo "PATH=$PATH" >> $GITHUB_ENV
           swiftc --version
 
diff --git a/.github/workflows/build-pico-sdk.yml b/.github/workflows/build-pico-sdk.yml
index 06283bd6..7f3ff5c8 100644
--- a/.github/workflows/build-pico-sdk.yml
+++ b/.github/workflows/build-pico-sdk.yml
@@ -48,7 +48,7 @@ jobs:
         run: |
           wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
           tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
-          export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
+          export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
           echo "PATH=$PATH" >> $GITHUB_ENV
           which swiftc
           swiftc --version
diff --git a/.github/workflows/build-zephyr.yml b/.github/workflows/build-zephyr.yml
index 0233f150..718372fa 100644
--- a/.github/workflows/build-zephyr.yml
+++ b/.github/workflows/build-zephyr.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build-zephyr:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
@@ -38,7 +38,7 @@ jobs:
         run: |
           wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
           tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
-          export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
+          export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
           echo "PATH=$PATH" >> $GITHUB_ENV
           swiftc --version