diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00c2f4190..2fa2a326c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,15 +14,15 @@ jobs:
           - examples/repeat_sensor_analog_input.cpp
           - examples/rpm_counter.cpp
         device:
-          - esp32dev
-          - esp32-c3-devkitm-1
+          - esp32
+          - esp32c3
         platform:
           - arduino
           - pioarduino
-          - espard
+          - espidf
         exclude:
           - platform: arduino
-            device: esp32-c3-devkitm-1
+            device: esp32c3
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
diff --git a/ci/platformio_arduino.ini b/ci/platformio_arduino.ini
deleted file mode 100644
index 08ba54a98..000000000
--- a/ci/platformio_arduino.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[env:default]
-; Global data for all [env:***]
-platform = espressif32 @ ^4.4.0
-framework = arduino
-lib_ldf_mode = deep
-monitor_speed = 115200
-lib_deps = ${sysenv.PROJDIR}
-
-board = ${sysenv.CI_DEVICE}
-build_unflags = -Werror=reorder
-board_build.partitions = min_spiffs.csv
-monitor_filters = esp32_exception_decoder
-build_flags =
-    -D LED_BUILTIN=2
-    -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
-    ; Arduino Core bug workaround: define the log tag for the Arduino
-    ; logging macros.
-    -D TAG='"Arduino"'
-    ; Use the ESP-IDF logging library - required by SensESP.
-    -D USE_ESP_IDF_LOG
diff --git a/ci/platformio_espard.ini b/ci/platformio_espard.ini
deleted file mode 100644
index f50d0236e..000000000
--- a/ci/platformio_espard.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[env:default]
-; Global data for all [env:***]
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
-framework = espif, arduino
-lib_ldf_mode = deep
-monitor_speed = 115200
-lib_deps = ${sysenv.PROJDIR}
-
-board_build.embed_txtfiles =
-    managed_components/espressif__esp_insights/server_certs/https_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
-
-board = ${sysenv.CI_DEVICE}
-build_unflags = -Werror=reorder
-board_build.partitions = ${sysenv.PROJDIR}/min_spiffs.csv
-monitor_filters = esp32_exception_decoder
-build_flags =
-    -D LED_BUILTIN=2
-    -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
-    ; Use the ESP-IDF logging library - required by SensESP.
-    -D USE_ESP_IDF_LOG
diff --git a/ci/platformio_pioarduino.ini b/ci/platformio_pioarduino.ini
deleted file mode 100644
index b598845bd..000000000
--- a/ci/platformio_pioarduino.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[env:default]
-; Global data for all [env:***]
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
-framework = arduino
-lib_ldf_mode = deep
-monitor_speed = 115200
-lib_deps = ${sysenv.PROJDIR}
-
-board = ${sysenv.CI_DEVICE}
-build_unflags = -Werror=reorder
-board_build.partitions = min_spiffs.csv
-monitor_filters = esp32_exception_decoder
-build_flags =
-    -D LED_BUILTIN=2
-    -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
-    ; Use the ESP-IDF logging library - required by SensESP.
-    -D USE_ESP_IDF_LOG
diff --git a/ci/run-ci.sh b/ci/run-ci.sh
index 371bc6895..47bc3c8e1 100755
--- a/ci/run-ci.sh
+++ b/ci/run-ci.sh
@@ -8,4 +8,4 @@ export PROJDIR=$(pwd)
 
 # the example to build comes from $PLATFORMIO_CI_SRC
 
-pio ci -c ci/platformio_${CI_PLATFORM}.ini
+pio ci -e ${CI_PLATFORM}_${CI_DEVICE} --project-conf platformio.ini --lib . --exclude examples --exclude docs --exclude .pio