diff --git a/garage-door-controller.yaml b/garage-door-controller.yaml
index bbaed93..f103aab 100644
--- a/garage-door-controller.yaml
+++ b/garage-door-controller.yaml
@@ -4,6 +4,9 @@ esphome:
   includes:
     - TFmini.h
 
+packages:
+  beacon: !include { file: packages/beacon.yaml, vars: { area: "Garage" }}
+
 substitutions:
   led_count: "60"
 
@@ -32,8 +35,13 @@ wifi:
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
     ssid: "Garage-Door-Controller"
-    password: "eXbhM8qXvoM3"
+    password: !secret garage_door_ap_password
 
+web_server:
+  auth: 
+    username: johndillenburg
+    password: !secret garage_door_ap_password
+  
 captive_portal:
 
 globals:
diff --git a/packages/beacon.yaml b/packages/beacon.yaml
index 48a1fd6..4eca97c 100644
--- a/packages/beacon.yaml
+++ b/packages/beacon.yaml
@@ -1,30 +1,28 @@
 # This file is included as a package in all mmwave presence sensors
 # Requires area variable to be set to the name of the room the sensor is in.
 #
+# Parameters passed in:
+#   - ${area} - name of the area this file is included in
+#
 esphome:
   comment: "Beacon"
 
-# Adding external component to build:
-external_components:
-  - source: github://formatBCE/ESP32_BLE_presense@main
-
 # System time config - required for precise timestamps, used in integration:
 time:
   - platform: homeassistant
     id: homeassistant_time
 
-# Initializing it:
-esp32_ble_presense:
-  area: "${area}" 
-  time_id: homeassistant_time
+bluetooth_proxy:
+
+esp32_ble_tracker:
 
 # MQTT config - required for this component to work:
-mqtt:
-  broker: 10.0.0.215
-  username: esp32_presence
-  password: findme
-  discovery_prefix: "homeassistant"
-  port: 1883
-  client_id: "${area}"
-  keepalive: 
-    minutes: 10
+# mqtt:
+#   broker: 10.0.0.215
+#   username: esp32_presence
+#   password: findme
+#   discovery_prefix: "homeassistant"
+#   port: 1883
+#   client_id: "${area}"
+#   keepalive: 
+#     minutes: 10