diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e6db7b..5026491 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,8 +14,8 @@ jobs:
           - project-template-esp8266.yaml
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.7
       - name: Build ESPHome firmware to verify configuration
-        uses: esphome/build-action@v1.5.0
+        uses: esphome/build-action@v3.1.0
         with:
           yaml_file: ${{ matrix.file }}
diff --git a/project-template-esp32.yaml b/project-template-esp32.yaml
index 8d21337..87f8b41 100644
--- a/project-template-esp32.yaml
+++ b/project-template-esp32.yaml
@@ -1,14 +1,11 @@
-# These substitutions allow the end user to override certain values
-substitutions:
-  name: "project-template"
-
 esphome:
-  name: "${name}"
+  name: project-template
+  friendly_name: Project Template
   # Automatically add the mac address to the name
   # so you can use a single firmware for all devices
   name_add_mac_suffix: true
 
-  # This will allow for (future) project identification,
+  # This will allow for project identification,
   # configuration and updates.
   project:
     name: esphome.project-template
@@ -17,7 +14,7 @@ esphome:
 esp32:
   board: esp32dev
   framework:
-    type: arduino
+    type: esp-idf
 
 # To be able to get logs from the device via serial and api.
 logger:
@@ -27,6 +24,7 @@ api:
 
 # OTA is required for Over-the-Air updating
 ota:
+  - platform: esphome
 
 # This should point to the public location of this yaml file.
 dashboard_import:
@@ -43,7 +41,7 @@ captive_portal:
 
 ##########################################################
 # Most projects should not remove anything from above here
-# and should just modify the name, project name/version 
+# and should just modify the name, project name/version
 # and git url for the dashboard_import
 ##########################################################
 
diff --git a/project-template-esp8266.yaml b/project-template-esp8266.yaml
index e0a4352..c240d33 100644
--- a/project-template-esp8266.yaml
+++ b/project-template-esp8266.yaml
@@ -1,9 +1,6 @@
-# These substitutions allow the end user to override certain values
-substitutions:
-  name: "project-template"
-
 esphome:
-  name: "${name}"
+  name: project-template
+  friendly_name: Project Template
   # Automatically add the mac address to the name
   # so you can use a single firmware for all devices
   name_add_mac_suffix: true
@@ -25,6 +22,7 @@ api:
 
 # OTA is required for Over-the-Air updating
 ota:
+  - platform: esphome
 
 # This should point to the public location of this yaml file.
 dashboard_import:
@@ -42,7 +40,7 @@ captive_portal:
 
 ##########################################################
 # Most projects should not remove anything from above here
-# and should just modify the name, project name/version 
+# and should just modify the name, project name/version
 # and git url for the dashboard_import
 ##########################################################