diff --git a/waveshare-esp32-s3-zero_btproxy.yaml b/waveshare-esp32-s3-zero_btproxy.yaml
index 0f7f9c9..4673411 100644
--- a/waveshare-esp32-s3-zero_btproxy.yaml
+++ b/waveshare-esp32-s3-zero_btproxy.yaml
@@ -3,10 +3,18 @@
 # TODO: Need to geenrate a unique minor number for the bluetooth
 
 substitutions:
-  name: "projcxt-template"
-  friendly_name: "Project Template"
+  name: "project-template"
+  #friendly_name: "Project Template"
   ibeacon_minor_number: 65535
-  wifi_ap_password: "CHANGE-ME-INSECURE-PASSWORD-e7bMQb9hDbVmUT3U"
+  #wifi_ap_password: "CHANGE-ME-INSECURE-PASSWORD-e7bMQb9hDbVmUT3U"
+
+packgaes:
+  remote_package:
+    url: https://gitea.dlitz.net/scratch/esphome-templates-dlitz
+    ref: main
+    files: ["waveshare-esp32-s3-zero_btproxy.yaml"]
+    refresh: id
+
 
 dashboard_import:
   package_import_url: https://gitea.dlitz.net/scratch/esphome-templates-dlitz.git/waveshare-esp32-s3-zero_btproxy.yaml
@@ -14,7 +22,11 @@ dashboard_import:
 
 esphome:
   name: "${name}"
-  friendly_name: "${friendly_name}"
+  name_add_mac_suffix: true
+  #friendly_name: "${friendly_name}"
+  #project:
+  #  name: "${project_name}"
+  #  version: "${project_version}"
 
 # Board: Waveshare ESP32-S3-Zero
 # Chip: ESP32-S3FH4R2
@@ -42,8 +54,8 @@ ota:
   - platform: esphome
 
 wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+  #ssid: !secret wifi_ssid
+  #password: !secret wifi_password
   fast_connect: true
   enable_btm: true
   enable_rrm: true
@@ -51,7 +63,7 @@ wifi:
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
     ssid: "${friendly_name} fallback"
-    password: "${wifi_ap_password}"
+    #password: "${wifi_ap_password}"
 
 captive_portal: