diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc09c54..17c4edf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,9 +16,12 @@ jobs:
     strategy:
       matrix:
         firmware:
-          - file: v2board.yaml
-            name: V2 Board
-            manifest_filename: v2board-manifest.json
+          - file: v2board_esp8266_d1_mini.yaml
+            name: V2 Board ESP8266 D1 Mini
+            manifest_filename: v2board_esp8266_d1_mini-manifest.json
+          - file: v2board_esp32_d1_mini.yaml
+            name: V2 Board ESP32 D1 Mini
+            manifest_filename: v2board_esp32_d1_mini-manifest.json            
       fail-fast: false
     steps:
       - name: Checkout source code
diff --git a/base.yml b/base.yml
index 0ee1d0f..7e42425 100644
--- a/base.yml
+++ b/base.yml
@@ -1,9 +1,5 @@
 ---
 
-esp8266:
-  board: d1_mini_lite
-  restore_from_flash: true
-
 external_components:
   - source:
       type: git
@@ -16,10 +12,10 @@ ratgdo:
 
 uart:
   tx_pin:
-    number: D4  # red control terminal / GarageDoorOpener (UART1 TX) pin is D4 on D1 Mini
+    number: ${uart_tx_pin}  # red control terminal / GarageDoorOpener (UART1 TX) pin is D4 on D1 Mini
     inverted: true
   rx_pin:
-    number: D2  # red control terminal / GarageDoorOpener (UART1 RX) pin is D2 on D1 Mini
+    number: ${uart_rx_pin}  # red control terminal / GarageDoorOpener (UART1 RX) pin is D2 on D1 Mini
     inverted: true
   baud_rate: 9600
 
@@ -44,7 +40,7 @@ switch:
     id: "${id_prefix}_status_door"
     internal: true
     pin: 
-      number: D0  # D0 output door status, HIGH for open, LOW for closed
+      number: ${status_door_pin}  # D0 output door status, HIGH for open, LOW for closed
       mode:
         output: true
     name: "Status door"
@@ -53,7 +49,7 @@ switch:
     id: "${id_prefix}_status_obstruction"
     internal: true
     pin: 
-      number: D8  # D8 output for obstruction status, HIGH for obstructed, LOW for clear
+      number: ${status_obstruction_pin}  # D8 output for obstruction status, HIGH for obstructed, LOW for clear
       mode:
         output: true
     name: "Status obstruction"
@@ -92,7 +88,7 @@ binary_sensor:
   - platform: gpio
     id: "${id_prefix}_dry_contact_open"
     pin: 
-      number: D5  # D5 dry contact for opening door
+      number: ${dry_contact_open_pin}  # D5 dry contact for opening door
       inverted: true
       mode:
         input: true
@@ -108,7 +104,7 @@ binary_sensor:
   - platform: gpio
     id: "${id_prefix}_dry_contact_close"
     pin: 
-      number: D6  # D6 dry contact for closing door
+      number: ${dry_contact_close_pin}  # D6 dry contact for closing door
       inverted: true
       mode:
         input: true
@@ -124,7 +120,7 @@ binary_sensor:
   - platform: gpio
     id: "${id_prefix}_dry_contact_light"
     pin: 
-      number: D3  # D3 dry contact for triggering light (no discrete light commands, so toggle only)
+      number: ${dry_contact_light_pin}  # D3 dry contact for triggering light (no discrete light commands, so toggle only)
       inverted: true
       mode:
         input: true
diff --git a/static/v2board.png b/static/v2board.png
deleted file mode 100644
index 3a3c287..0000000
Binary files a/static/v2board.png and /dev/null differ
diff --git a/static/v2board.png b/static/v2board.png
new file mode 120000
index 0000000..529878b
--- /dev/null
+++ b/static/v2board.png
@@ -0,0 +1 @@
+v2board_esp8266_d1_mini.png
\ No newline at end of file
diff --git a/static/v2board.yaml b/static/v2board.yaml
deleted file mode 100644
index cf775a7..0000000
--- a/static/v2board.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-substitutions:
-  id_prefix: ratgdov2
-  friendly_name: "RATGDOv2"
-
-web_server:
-
-esphome:
-  name: ${id_prefix}
-  friendly_name: ${friendly_name}
-  name_add_mac_suffix: true
-  project:
-    name: ratgdo.esphome
-    version: "2.0"
-
-dashboard_import:
-  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo.yaml@main
-
-packages:
-  # Git repo examples
-  remote_package:
-    url: https://github.com/esphome-ratgdo/esphome-ratgdo
-    files: [base.yml]
-    refresh: 1s # optional
-
-# Sync time with Home Assistant.
-time:
-  - platform: homeassistant
-    id: homeassistant_time
-
-api:
-  id: api_server
-
-ota:
-
-improv_serial:
-
-wifi:
-  ap:
-
-logger:
diff --git a/static/v2board.yaml b/static/v2board.yaml
new file mode 120000
index 0000000..bb83f94
--- /dev/null
+++ b/static/v2board.yaml
@@ -0,0 +1 @@
+v2board_esp8266_d1_mini.yaml
\ No newline at end of file
diff --git a/static/v2board/v2board.bin b/static/v2board/v2board.bin
deleted file mode 100644
index e69de29..0000000
diff --git a/static/v2board_esp32_d1_mini.yaml b/static/v2board_esp32_d1_mini.yaml
new file mode 100644
index 0000000..fb7c08b
--- /dev/null
+++ b/static/v2board_esp32_d1_mini.yaml
@@ -0,0 +1,41 @@
+---
+substitutions:
+  id_prefix: ratgdov2
+  friendly_name: "RATGDOv2"
+
+web_server:
+
+esphome:
+  name: ${id_prefix}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: true
+  project:
+    name: ratgdo.esphome
+    version: "2.0"
+
+dashboard_import:
+  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo.yaml@main
+
+packages:
+  # Git repo examples
+  remote_package:
+    url: https://github.com/esphome-ratgdo/esphome-ratgdo
+    files: [base.yml, v2board_esp32_d1_mini_include.yaml]
+    refresh: 1s # optional
+
+# Sync time with Home Assistant.
+time:
+  - platform: homeassistant
+    id: homeassistant_time
+
+api:
+  id: api_server
+
+ota:
+
+improv_serial:
+
+wifi:
+  ap:
+
+logger:
diff --git a/static/v2board_esp8266_d1_mini.png b/static/v2board_esp8266_d1_mini.png
new file mode 100644
index 0000000..3a3c287
Binary files /dev/null and b/static/v2board_esp8266_d1_mini.png differ
diff --git a/static/v2board_esp8266_d1_mini.yaml b/static/v2board_esp8266_d1_mini.yaml
new file mode 100644
index 0000000..0686207
--- /dev/null
+++ b/static/v2board_esp8266_d1_mini.yaml
@@ -0,0 +1,41 @@
+---
+substitutions:
+  id_prefix: ratgdov2
+  friendly_name: "RATGDOv2"
+
+web_server:
+
+esphome:
+  name: ${id_prefix}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: true
+  project:
+    name: ratgdo.esphome
+    version: "2.0"
+
+dashboard_import:
+  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo_v2board_esp8266_d1_mini.yaml@main
+
+packages:
+  # Git repo examples
+  remote_package:
+    url: https://github.com/esphome-ratgdo/esphome-ratgdo
+    files: [base.yml, v2board_esp8266_d1_mini_include.yaml]
+    refresh: 1s # optional
+
+# Sync time with Home Assistant.
+time:
+  - platform: homeassistant
+    id: homeassistant_time
+
+api:
+  id: api_server
+
+ota:
+
+improv_serial:
+
+wifi:
+  ap:
+
+logger: