diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5bfff910..9535ab2c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,6 +20,12 @@ jobs:
             out: arduitouch
           - env: d1-mini-esp32_ili9341
             out: d1-mini-esp32
+          - env: d1-r32-waveshare_ili9486
+            out: d1-r32-espduino32
+          - env: d1-r32-unoshield_ili9341_adc
+            out: d1-r32-espduino32
+          - env: d1-r32-unoshield_ili9486_adc
+            out: d1-r32-espduino32
           - env: esp32-one_st7796
             out: esp32-one
           - env: esp32-touchdown
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9341-adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
similarity index 98%
rename from user_setups/esp32/d1-r32-unoshield_ili9341-adc.ini
rename to user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
index d54f3d5d..b98e7478 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9341-adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
@@ -4,7 +4,7 @@
 ;      - Arduino UNO ILI9341 2.4" TFT shield        ;
 ;***************************************************;
 
-[env:esp32-9341-unoshield-analog]
+[env:d1-r32-unoshield_ili9486_adc]
 extends = esp32_4mb
 board = esp32dev
 
diff --git a/user_setups/esp32/d1-r32-esp32_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
similarity index 97%
rename from user_setups/esp32/d1-r32-esp32_ili9486.ini
rename to user_setups/esp32/d1-r32-waveshare_ili9486.ini
index 32737c24..2f17fffb 100644
--- a/user_setups/esp32/d1-r32-esp32_ili9486.ini
+++ b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
@@ -5,7 +5,7 @@
 ;               - xpt2046 touch controller          ;
 ;***************************************************;
 
-[env:d1-r32-esp32_ili9486]
+[env:d1-r32-waveshare_ili9486]
 extends = esp32_4mb
 board = wemos_d1_mini32