diff --git a/CYD-Klipper/src/core/device/ESP32-CROWPANEL-35C.cpp b/CYD-Klipper/src/core/device/ESP32-CROWPANEL-35C.cpp
index 8231777..bf25583 100644
--- a/CYD-Klipper/src/core/device/ESP32-CROWPANEL-35C.cpp
+++ b/CYD-Klipper/src/core/device/ESP32-CROWPANEL-35C.cpp
@@ -1,6 +1,5 @@
 // Adapted from https://github.com/OzInFl/Elecrow-3.5-RGB-TFT-SQUARELINE-EXAMPLE
 
-#define CYD_SCREEN_DRIVER_ESP32_CROWPANEL_35C
 #ifdef CYD_SCREEN_DRIVER_ESP32_CROWPANEL_35C
 #include "../screen_driver.h"
 #include "lvgl.h"
@@ -145,7 +144,8 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
 void screen_setup()
 {
     pinMode(BUZZER_PIN, OUTPUT);
-    digitalWrite(BUZZER_PIN, HIGH);
+    ledcSetup(4, 5000, 8);
+    ledcAttachPin(BUZZER_PIN, 4);
 
     tft.begin();
     tft.setRotation(global_config.rotate_screen ? 3 : 1);
diff --git a/ci.py b/ci.py
index 3917a62..535cdf6 100644
--- a/ci.py
+++ b/ci.py
@@ -11,12 +11,14 @@ CYD_PORTS = [
     "esp32-3248S035C-V",
     #"esp32-4827S043R-SD",
     "esp32-CROWPANEL-28R",
+    "esp32-CROWPANEL-35C",
 ]
 
 ESP_S3_CHIPS = [
     "esp32-8048S043C-SD",
     "esp32-8048S043C-SD-alt",
     "esp32-4827S043C-SD",
+    "esp32-CROWPANEL-35C",
 ]
 
 BASE_DIR = os.getcwd()
@@ -80,7 +82,10 @@ for port in CYD_PORTS:
 
     shutil.copy(os.path.join(os.path.expanduser("~"), ".platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin"), f"{port_path}/boot_app0.bin")
     os.chdir(port_path)
-    subprocess.run(["python3", "-m", "esptool", "--chip", "esp32", "merge_bin", "-o", "merged_firmware.bin", "--flash_mode", "dio", "--flash_freq", "40m", "--flash_size", "4MB", "0x1000", "bootloader.bin", "0x8000", "partitions.bin", "0xe000", "boot_app0.bin", "0x10000", "firmware.bin"], check=True)
+    if (port in ESP_S3_CHIPS):
+        subprocess.run(["python3", "-m", "esptool", "--chip", "esp32s3", "merge_bin", "-o", "merged_firmware.bin", "--flash_mode", "qio", "--flash_freq", "80m", "--flash_size", "16MB", "0x1000", "bootloader.bin", "0x8000", "partitions.bin", "0xe000", "boot_app0.bin", "0x10000", "firmware.bin"], check=True)
+    else:    
+        subprocess.run(["python3", "-m", "esptool", "--chip", "esp32", "merge_bin", "-o", "merged_firmware.bin", "--flash_mode", "dio", "--flash_freq", "40m", "--flash_size", "4MB", "0x1000", "bootloader.bin", "0x8000", "partitions.bin", "0xe000", "boot_app0.bin", "0x10000", "firmware.bin"], check=True)
 
     os.chdir(BASE_DIR)