diff --git a/bin/generate_ci_matrix.py b/bin/generate_ci_matrix.py
index 7513ccff5..0ce6b0f6b 100755
--- a/bin/generate_ci_matrix.py
+++ b/bin/generate_ci_matrix.py
@@ -27,7 +27,7 @@ for subdir, dirs, files in os.walk(rootdir):
                 if c.startswith("env:"):
                     section = config[c].name[4:]
                     if "extends" in config[config[c].name]:
-                        if config[config[c].name]["extends"] == options[0] + "_base":
+                        if options[0] + "_base" in config[config[c].name]["extends"]:
                             if "board_level" in config[config[c].name]:
                                 if (
                                     config[config[c].name]["board_level"] == "extra"
diff --git a/variants/elecrow_panel/platformio.ini b/variants/elecrow_panel/platformio.ini
index 963174560..d15aa969a 100644
--- a/variants/elecrow_panel/platformio.ini
+++ b/variants/elecrow_panel/platformio.ini
@@ -48,7 +48,7 @@ lib_deps = ${esp32s3_base.lib_deps}
   lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality
   hideakitai/TCA9534@0.1.1
 
-[crowpanel_small] ; 2.4, 2.8, 3.5 inch
+[crowpanel_large_esp32s3_base_esp32s3_base] ; 2.4, 2.8, 3.5 inch
 extends = crowpanel_base
 build_flags =
   ${crowpanel_base.build_flags}
@@ -73,9 +73,9 @@ build_flags =
   -D DISPLAY_SET_RESOLUTION
 
 [env:elecrow-adv-24-28-tft]
-extends = crowpanel_small
+extends = crowpanel_large_esp32s3_base_esp32s3_base
 build_flags =
-  ${crowpanel_small.build_flags}
+  ${crowpanel_large_esp32s3_base_esp32s3_base.build_flags}
   -D SPI_FREQUENCY=80000000
   -D LGFX_SCREEN_WIDTH=240
   -D LGFX_SCREEN_HEIGHT=320
@@ -96,9 +96,9 @@ build_flags =
   -D LGFX_TOUCH_ROTATION=0
 
 [env:elecrow-adv-35-tft]
-extends = crowpanel_small
+extends = crowpanel_large_esp32s3_base_esp32s3_base
 build_flags =
-  ${crowpanel_small.build_flags}
+  ${crowpanel_large_esp32s3_base_esp32s3_base.build_flags}
   -D LV_CACHE_DEF_SIZE=2097152
   -D SPI_FREQUENCY=60000000
   -D LGFX_SCREEN_WIDTH=320