diff --git a/ratgdo.yaml b/ratgdo.yaml
deleted file mode 120000
index 7157752..0000000
--- a/ratgdo.yaml
+++ /dev/null
@@ -1 +0,0 @@
-static/v2board_esp8266_d1_mini.yaml
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
index 7142640..3304110 100644
--- a/static/index.html
+++ b/static/index.html
@@ -160,9 +160,13 @@
 
       <div class="radios">
         <label>
-          <input type="radio" name="type" value="v2board" checked />
-          <img src="./v2board.png" alt="RATGDO v2 board" />
+          <input type="radio" name="type" value="v2board_esp8266_d1_mini_lite" checked />
+          <img src="./v2board_esp8266_d1_mini_lite" alt="RATGDO v2 board with ESP8266 D1 Mini Lite" />
         </label>
+        <label>
+          <input type="radio" name="type" value="v2board_esp32_d1_mini" checked />
+          <img src="./v2board_esp32_d1_mini" alt="RATGDO v2 board with ESP32 D1 Mini" />
+        </label>        
       </div>
 
       <p class="button-row" align="center">
diff --git a/static/v2board.png b/static/v2board.png
deleted file mode 120000
index 529878b..0000000
--- a/static/v2board.png
+++ /dev/null
@@ -1 +0,0 @@
-v2board_esp8266_d1_mini.png
\ No newline at end of file
diff --git a/static/v2board.yaml b/static/v2board.yaml
deleted file mode 120000
index bb83f94..0000000
--- a/static/v2board.yaml
+++ /dev/null
@@ -1 +0,0 @@
-v2board_esp8266_d1_mini.yaml
\ No newline at end of file
diff --git a/static/v2board_esp8266_d1_mini.png b/static/v2board_esp32_d1_mini.png
similarity index 100%
rename from static/v2board_esp8266_d1_mini.png
rename to static/v2board_esp32_d1_mini.png
diff --git a/static/v2board_esp32_d1_mini.yaml b/static/v2board_esp32_d1_mini.yaml
index e8dfc47..2a265f9 100644
--- a/static/v2board_esp32_d1_mini.yaml
+++ b/static/v2board_esp32_d1_mini.yaml
@@ -13,14 +13,26 @@ esphome:
     name: ratgdo.esphome
     version: "2.0"
 
+esp32:
+  board: d1_mini32
+
+substitutions:
+  uart_tx_pin: D4
+  uart_rx_pin: D2
+  status_door_pin: D0
+  status_obstruction_pin: D8
+  dry_contact_open_pin: D5
+  dry_contact_close_pin: D6
+  dry_contact_light_pin: D3
+
 dashboard_import:
-  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo.yaml@main
+  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo_v2board_esp32_d1_mini.yaml@main
 
 packages:
   # Git repo examples
   remote_package:
     url: https://github.com/esphome-ratgdo/esphome-ratgdo
-    files: [v2board_esp32_d1_mini_include.yaml, base.yaml]
+    files: [base.yaml]
     refresh: 1s # optional
 
 # Sync time with Home Assistant.
diff --git a/static/v2board_esp8266_d1_mini_lite.png b/static/v2board_esp8266_d1_mini_lite.png
new file mode 100644
index 0000000..3a3c287
Binary files /dev/null and b/static/v2board_esp8266_d1_mini_lite.png differ
diff --git a/static/v2board_esp8266_d1_mini.yaml b/static/v2board_esp8266_d1_mini_lite.yaml
similarity index 67%
rename from static/v2board_esp8266_d1_mini.yaml
rename to static/v2board_esp8266_d1_mini_lite.yaml
index 0ceecf8..1202c0f 100644
--- a/static/v2board_esp8266_d1_mini.yaml
+++ b/static/v2board_esp8266_d1_mini_lite.yaml
@@ -2,6 +2,13 @@
 substitutions:
   id_prefix: ratgdov2
   friendly_name: "RATGDOv2"
+  uart_tx_pin: D4
+  uart_rx_pin: D2
+  status_door_pin: D0
+  status_obstruction_pin: D8
+  dry_contact_open_pin: D5
+  dry_contact_close_pin: D6
+  dry_contact_light_pin: D3
 
 web_server:
 
@@ -13,14 +20,18 @@ esphome:
     name: ratgdo.esphome
     version: "2.0"
 
+esp8266:
+  board: d1_mini_lite
+  restore_from_flash: true
+
 dashboard_import:
-  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo_v2board_esp8266_d1_mini.yaml@main
+  package_import_url: github://esphome-ratgdo/esphome-ratgdo/ratgdo_v2board_esp8266_d1_mini_lite.yaml@main
 
 packages:
   # Git repo examples
   remote_package:
     url: https://github.com/esphome-ratgdo/esphome-ratgdo
-    files: [v2board_esp8266_d1_mini_include.yaml, base.yaml]
+    files: [base.yaml]
     refresh: 1s # optional
 
 # Sync time with Home Assistant.
diff --git a/v2board.yaml b/v2board.yaml
deleted file mode 120000
index 7157752..0000000
--- a/v2board.yaml
+++ /dev/null
@@ -1 +0,0 @@
-static/v2board_esp8266_d1_mini.yaml
\ No newline at end of file
diff --git a/v2board_esp32_d1_mini_include.yaml b/v2board_esp32_d1_mini_include.yaml
deleted file mode 100644
index 9045096..0000000
--- a/v2board_esp32_d1_mini_include.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-esp32:
-  board: d1_mini32
-
-substitutions:
-  uart_tx_pin: D4
-  uart_rx_pin: D2
-  status_door_pin: D0
-  status_obstruction_pin: D8
-  dry_contact_open_pin: D5
-  dry_contact_close_pin: D6
-  dry_contact_light_pin: D3
diff --git a/v2board_esp8266_d1_mini.yaml b/v2board_esp8266_d1_mini.yaml
deleted file mode 120000
index 7157752..0000000
--- a/v2board_esp8266_d1_mini.yaml
+++ /dev/null
@@ -1 +0,0 @@
-static/v2board_esp8266_d1_mini.yaml
\ No newline at end of file
diff --git a/v2board_esp8266_d1_mini_include.yaml b/v2board_esp8266_d1_mini_include.yaml
deleted file mode 100644
index 69f1de7..0000000
--- a/v2board_esp8266_d1_mini_include.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-esp8266:
-  board: d1_mini_lite
-  restore_from_flash: true
-
-substitutions:
-  uart_tx_pin: D4
-  uart_rx_pin: D2
-  status_door_pin: D0
-  status_obstruction_pin: D8
-  dry_contact_open_pin: D5
-  dry_contact_close_pin: D6
-  dry_contact_light_pin: D3
-
diff --git a/v2board_esp8266_d1_mini_lite.yaml b/v2board_esp8266_d1_mini_lite.yaml
new file mode 120000
index 0000000..d5bb123
--- /dev/null
+++ b/v2board_esp8266_d1_mini_lite.yaml
@@ -0,0 +1 @@
+static/v2board_esp8266_d1_mini_lite.yaml
\ No newline at end of file