diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6b37e5..ac01670 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,7 @@ jobs:
       files: |
         esp32-generic/esp32-generic.factory.yaml
         esp32-generic/esp32-generic-c3.factory.yaml
+        esp32-generic/esp32-generic-s3.factory.yaml
       esphome-version: 2024.12.2
       combined-name: esp32-generic
       release-summary: ${{ github.event_name == 'release' && github.event.release.body || '' }}
diff --git a/esp32-generic/esp32-generic-c3.yaml b/esp32-generic/esp32-generic-c3.yaml
index 1dead68..c151fc5 100644
--- a/esp32-generic/esp32-generic-c3.yaml
+++ b/esp32-generic/esp32-generic-c3.yaml
@@ -1,12 +1,8 @@
 esphome:
   name: esp32-bluetooth-proxy
   friendly_name: Bluetooth Proxy
-  min_version: 2024.6.0
+  min_version: 2024.12.0
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.f_flash: 40000000L
-    board_build.flash_mode: dio
-    board_build.flash_size: 4MB
 
 esp32:
   board: esp32-c3-devkitm-1
diff --git a/esp32-generic/esp32-generic-s3.factory.yaml b/esp32-generic/esp32-generic-s3.factory.yaml
new file mode 100644
index 0000000..896aad4
--- /dev/null
+++ b/esp32-generic/esp32-generic-s3.factory.yaml
@@ -0,0 +1,24 @@
+packages:
+  esp32-generic-s3: !include esp32-generic-s3.yaml
+
+esphome:
+  project:
+    name: esphome.bluetooth-proxy
+    version: dev
+
+improv_serial:
+
+ota:
+  - platform: http_request
+    id: ota_http_request
+
+update:
+  - platform: http_request
+    id: update_http_request
+    name: Firmware
+    source: https://firmware.esphome.io/bluetooth-proxy/esp32-generic/manifest.json
+
+http_request:
+
+dashboard_import:
+  package_import_url: github://esphome/bluetooth-proxies/esp32-generic/esp32-generic-s3.yaml@main
diff --git a/esp32-generic/esp32-generic-s3.yaml b/esp32-generic/esp32-generic-s3.yaml
new file mode 100644
index 0000000..8bd69f6
--- /dev/null
+++ b/esp32-generic/esp32-generic-s3.yaml
@@ -0,0 +1,39 @@
+esphome:
+  name: esp32-bluetooth-proxy
+  friendly_name: Bluetooth Proxy
+  min_version: 2024.12.0
+  name_add_mac_suffix: true
+
+esp32:
+  board: esp32-s3-devkitc-1
+  framework:
+    type: esp-idf
+
+wifi:
+  ap:
+
+api:
+logger:
+
+ota:
+  - platform: esphome
+    id: ota_esphome
+
+esp32_ble_tracker:
+  scan_parameters:
+    # We currently use the defaults to ensure Bluetooth
+    # can co-exist with WiFi In the future we may be able to
+    # enable the built-in coexistence logic in ESP-IDF
+    active: true
+
+bluetooth_proxy:
+  active: true
+
+button:
+  - platform: safe_mode
+    id: button_safe_mode
+    name: Safe Mode Boot
+
+  - platform: factory_reset
+    id: factory_reset_btn
+    name: Factory reset
diff --git a/m5stack/m5stack-atom-s3.yaml b/m5stack/m5stack-atom-s3.yaml
index d2a5677..965b9b6 100644
--- a/m5stack/m5stack-atom-s3.yaml
+++ b/m5stack/m5stack-atom-s3.yaml
@@ -1,12 +1,11 @@
 esphome:
   name: m5stack-atom-s3
   friendly_name: Bluetooth Proxy
-  min_version: 2024.6.0
+  min_version: 2024.12.0
   name_add_mac_suffix: true
 
 esp32:
   board: m5stack-atoms3
-  variant: esp32s3
   framework:
     type: esp-idf