diff --git a/.github/workflows/push.yml b/.github/workflows/ci.yml
similarity index 62%
rename from .github/workflows/push.yml
rename to .github/workflows/ci.yml
index 475bb91..7d3b583 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/ci.yml
@@ -28,37 +28,39 @@ jobs:
           LWIP_IPV6: true
         run: arduino-cli --config-file ${{ matrix.config }} --library ./src/ compile --fqbn esp32:esp32:esp32 ./examples/ClientServer/Client/Client.ino
 
-  build-pio:
-    name: ${{ matrix.board }} ${{ matrix.env }}
+  pio_envs:
+    name: Get PlatformIO Envs
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        board: [esp32dev, esp32-s3-devkitc-1]
-        env: [arduino-2, arduino-3]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
-          path: |
-            ~/.platformio
-            ~/.cache/pip
-          key: ${{ matrix.env }}
+          key: pip
+          path: ~/.cache/pip
       - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-      - run: pip install platformio
-      - run: sed -i -e 's/esp32dev/${{ matrix.board }}/g' platformio.ini
-      - run: pio run -e ${{ matrix.env }}
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+      - name: Get Envs
+        id: envs
+        run: |
+          echo "pio_default_envs=$(pio project config --json-output | jq -cr '[ .[][0] | select(startswith("env:") and (endswith("-debug")|not)) | .[4:] ]')" >> $GITHUB_OUTPUT
 
-  build-pioarduino:
-    name: ${{ matrix.board }} ${{ matrix.env }}
+    outputs:
+      pio_default_envs: ${{ steps.envs.outputs.pio_default_envs }}
+      
+  build-pio:
+    name: "pio:${{ matrix.environment }}"
+    needs: [pio_envs]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        board: [esp32-c6-devkitc-1]
-        env: [pioarduino]
+        environment: ${{ fromJSON(needs.pio_envs.outputs.pio_default_envs) }}
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -66,11 +68,15 @@ jobs:
           path: |
             ~/.platformio
             ~/.cache/pip
-          key: ${{ matrix.env }}
+          key: pio
       - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - run: pip install platformio
-      - run: sed -i -e 's/esp32-c6-devkitc-1/${{ matrix.board }}/g' platformio.ini
-      - run: pio run -e ${{ matrix.env }}
-  
\ No newline at end of file
+
+      - name: Install platformio
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+        
+      - run: PLATFORMIO_SRC_DIR=examples/ClientServer/Client pio run -e ${{ matrix.environment }}
diff --git a/platformio.ini b/platformio.ini
index 6e7e7c0..4cfad22 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -27,6 +27,22 @@ platform_packages=
   platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip
 board = esp32dev
 
-[env:pioarduino]
+[env:pioarduino-esp32dev]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.03/platform-espressif32.zip
+board = esp32dev
+
+[env:pioarduino-esp32-s2]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.03/platform-espressif32.zip
+board = esp32-s2-saola-1
+
+[env:pioarduino-esp32-s3]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.03/platform-espressif32.zip
+board = esp32-s3-devkitc-1
+
+[env:pioarduino-esp32-c3]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.03/platform-espressif32.zip
+board = esp32-c3-devkitc-02
+
+[env:pioarduino-esp32-c6]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.03/platform-espressif32.zip
 board = esp32-c6-devkitc-1