diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index cf85cb3..ddec37b 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -45,6 +45,8 @@ Since in this update lots of input to the blueprint changed, we highly recommend
      - IP
      - SSID
      - BSSID
+   - ESPHome components:
+     - Web server
 
     You can still add these components (except by "Exit reparse") by adding the file `nspanel_esphome_advanced.yaml` in your ESPHome settings as in the example bellow, but please have in mind that these are not used by the blueprint and will be using some memory of your ESPHome. 
 ```yaml
diff --git a/nspanel_esphome_advanced.yaml b/nspanel_esphome_advanced.yaml
index f743e54..0c43070 100644
--- a/nspanel_esphome_advanced.yaml
+++ b/nspanel_esphome_advanced.yaml
@@ -90,3 +90,11 @@ text_sensor:
     bssid:
       name: ${device_name} BSSID
       disabled_by_default: true
+
+##### WEB SERVER SETUP #####
+web_server:
+  id: web_server_std
+  port: 80
+  auth:
+    username: admin
+    password: ${wifi_password}
diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml
index dce6e40..dcd00f7 100644
--- a/nspanel_esphome_core.yaml
+++ b/nspanel_esphome_core.yaml
@@ -64,14 +64,6 @@ wifi:
     ssid: "${device_name}"
     password: ${wifi_password}
 
-##### WEB SERVER SETUP - Required for json parsing and tft upload #####
-web_server:
-  id: web_server_std
-  port: 80
-  auth:
-    username: admin
-    password: ${wifi_password}
-
 ##### OTA PASSWORD #####
 ota:
   id: ota_std
@@ -80,6 +72,9 @@ ota:
   reboot_timeout: 3min
   num_attempts: 3
 
+##### JSON - Used to parse json and for Upload TFT #####
+json:
+
 ##### LOGGER #####
 logger:
   id: logger_std