diff --git a/CT-Files/esphome/Configs/esphome.service b/CT-Files/esphome/Configs/esphome.service
index 20cf886..287a9a6 100644
--- a/CT-Files/esphome/Configs/esphome.service
+++ b/CT-Files/esphome/Configs/esphome.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 User=esphome
-ExecStart=/opt/ESPHome/srv/bin/esphome -q dashboard /opt/ESPHome/data/
+ExecStart=/opt/ESPHome/srv/bin/esphome-device-builder /opt/ESPHome/data/ --log-level warning
 Restart=on-failure
 RestartSec=5s
 Environment="PATH=/usr/local/bin:/usr/bin:/bin:/opt/ESPHome/srv/bin"
diff --git a/CT-Files/esphome/Scripts/Init.sh b/CT-Files/esphome/Scripts/Init.sh
index f26630e..a405af4 100644
--- a/CT-Files/esphome/Scripts/Init.sh
+++ b/CT-Files/esphome/Scripts/Init.sh
@@ -5,7 +5,7 @@ mkdir -p /opt/ESPHome/data
 adduser  --group --system --no-create-home --home /opt/ESPHome/data --shell /bin/sh esphome
 chown -R esphome:esphome /opt/ESPHome
 sudo -u esphome python3 -m venv /opt/ESPHome/srv
-sudo -u esphome sh -c '. /opt/ESPHome/srv/bin/activate && pip install --upgrade pip && pip3 install tornado esptool esphome'
+sudo -u esphome sh -c '. /opt/ESPHome/srv/bin/activate && pip install --upgrade pip && pip3 install esphome-device-builder[esphome]'
 
 #Update script
 mv /opt/Setup/Scripts/UpdateESPHome.sh /opt/UpdateESPHome.sh
diff --git a/CT-Files/esphome/Scripts/UpdateESPHome.sh b/CT-Files/esphome/Scripts/UpdateESPHome.sh
index cd9f6f5..192f724 100644
--- a/CT-Files/esphome/Scripts/UpdateESPHome.sh
+++ b/CT-Files/esphome/Scripts/UpdateESPHome.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 service esphome stop
-sudo -u esphome sh -c '. /opt/ESPHome/srv/bin/activate && pip install --upgrade pip && pip3 install --upgrade tornado esptool esphome'
+sudo -u esphome sh -c '. /opt/ESPHome/srv/bin/activate && pip install --upgrade pip && pip3 install --upgrade esphome-device-builder[esphome] && pip3 install --upgrade esphome'
 service esphome start
\ No newline at end of file