diff --git a/esphome/nspanel_esphome_addon_upload_tft.yaml b/esphome/nspanel_esphome_addon_upload_tft.yaml
index ec66037..50720be 100644
--- a/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -118,8 +118,7 @@ script:
       baud_rate: uint32_t
     then:
       - lambda: |-
-          static const char *const TAG = "addon_upload_tft.script.nextion_upload";
-          ESP_LOGD(TAG, "Waiting for empty UART and Nextion queues");
+          ESP_LOGD("addon_upload_tft.script.nextion_upload", "Waiting for empty UART and Nextion queues");
       - wait_until:
           condition:
             - lambda: return (disp1->queue_size() < 1);
@@ -127,10 +126,9 @@ script:
           timeout: 10s
       - delay: 2s
       - lambda: |-
-          static const char *const TAG = "addon_upload_tft.script.nextion_upload";
-          ESP_LOGD(TAG, "Starting TFT upload...");
+          ESP_LOGD("addon_upload_tft.script.nextion_upload", "Starting TFT upload...");
           id(tft_upload_result) = disp1->upload_tft(baud_rate, !disp1->is_setup());
-          ESP_LOGD(TAG, "TFT upload: %s", esphome::nextion::Nextion::tft_upload_result_to_string(id(tft_upload_result)));
+          ESP_LOGD("addon_upload_tft.script.nextion_upload", "TFT upload: %s", esphome::nextion::Nextion::tft_upload_result_to_string(id(tft_upload_result)));
 
   - id: open_upload_dialog
     mode: restart
@@ -162,8 +160,7 @@ script:
       message: string
     then:
       - lambda: |-
-          static const char *const TAG = "addon_upload_tft.script.report_upload_progress";
-          ESP_LOGD(TAG, "%s", message.c_str());
+          ESP_LOGD("addon_upload_tft.script.report_upload_progress", "%s", message.c_str());
           if (id(tft_is_valid)) {
             if (page_id->state != 26) {
               open_upload_dialog->execute();
@@ -193,7 +190,6 @@ script:
       # Then start the upload
       - lambda: |-
           static const char *const TAG = "addon_upload_tft.script.upload_tft";
-          ESP_LOGD(TAG, "Starting...");
 
           id(is_uploading_tft) = true;
 
@@ -303,11 +299,9 @@ script:
       ### This code should never run
       - delay: 2s
       - lambda: |-
-          static const char *const TAG = "addon_upload_tft.script.upload_tft";
-          ESP_LOGD(TAG, "Finishing...");
           id(is_uploading_tft) = false;
           screen_power->publish_state(true);
-          ESP_LOGE(TAG, "TFT upload finished unsuccessfully!");
+          ESP_LOGE("addon_upload_tft.script.upload_tft", "TFT upload finished unsuccessfully!");
 
   - id: upload_tft_sequence_attempt
     mode: single