diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 875e2b0..946a6d0 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -58,6 +58,7 @@ We did our best to support your legacy settings and avoid breaking your system,
 
     We understand this change can require substantial work on the exisiting automations with direct calls to the panel's services,
     however this will significantly improve the future customizations by providing compreensive documentation, standardizing and optimizing services calls.
+3. **`captive_portal` and `web_server` are back to basic package**. If you want to remove those to free-up memory, please use [customizations](docs/customization.md#remove-non-essential-components).
 
 ## Overview of noteworthy changes
 1. New default framework
diff --git a/docs/customization.md b/docs/customization.md
index 9f191bd..04c3f8c 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -32,6 +32,7 @@ Table of contents:
   - [Push button / Momentary switch](#push-button--momentary-switch)
   - [Expose relay fallback switch](#expose-relay-fallback-switch)
   - [Relay Interlocking](#relay-interlocking)
+  - [Remove non-essential components](#remove-non-essential-components)
 
  
  
@@ -685,4 +686,15 @@ switch:
   - id: !extend relay_2
     interlock: [relay_1, relay_2]
     interlock_wait_time: 500ms  # Please adjust this accordingly
-```
\ No newline at end of file
+```
+
+### Remove non-essential components
+This can be useful to free-up memory, so other custom components could be used instead.
+
+```yaml
+# Removes captive portal
+captive_portal: !remove
+
+# Removes embedded web server
+web_server: !remove
+```
diff --git a/esphome/nspanel_esphome_advanced.yaml b/esphome/nspanel_esphome_advanced.yaml
index 2fb8df5..d3cad67 100644
--- a/esphome/nspanel_esphome_advanced.yaml
+++ b/esphome/nspanel_esphome_advanced.yaml
@@ -11,7 +11,6 @@ substitutions:
   ##### Do not change this here.  #####
   ##### Set your substitutions on #####
   ##### your base yaml file.      #####
-  web_password: ${wifi_password}
   #####################################
 
 button:
@@ -27,8 +26,6 @@ button:
       - logger.log: "Button pressed: Exit reparse"
       - script.execute: exit_reparse
 
-captive_portal:
-
 script:
   - id: exit_reparse
     mode: restart
@@ -96,10 +93,4 @@ time:
         - component.update: api_timestamp
         - component.update: device_timestamp
 
-web_server:
-  id: web_server_std
-  port: 80
-  auth:
-    username: admin
-    password: ${web_password}
 ...
diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index f0b1d94..90a1f1c 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -9,14 +9,15 @@ substitutions:
   ##############################
   ## Change only in your      ##
   ## local yaml substitutions ##
-  temp_units: "°C"
-  invalid_cooldown: "100ms"
-  ota_password: ${wifi_password}
-  ap_password: ${wifi_password}
   device_name: NSPanel
   name: ${device_name}
   friendly_name: ${device_name}
+  ap_password: ${wifi_password}
+  ota_password: ${wifi_password}
+  web_password: ${wifi_password}
   wifi_timeout: '15'
+  temp_units: "°C"
+  invalid_cooldown: "100ms"
   ##### DON'T CHANGE THIS ######
   version: "4.3dev"
   ##############################
@@ -107,6 +108,8 @@ wifi:
     then:
       - script.execute: watchdog
 
+captive_portal:
+
 ##### OTA PASSWORD #####
 ota:
   id: ota_std
@@ -160,6 +163,14 @@ time:
         - logger.log: "System clock synchronized"
         - script.execute: refresh_datetime
 
+##### Web server #####
+web_server:
+  id: web_server_std
+  port: 80
+  auth:
+    username: admin
+    password: ${web_password}
+
 ##### START - API CONFIGURATION #####
 api:
   id: api_server