diff --git a/packages/alarm-panel-esp32-base.yaml b/packages/alarm-panel-esp32-base.yaml
index c0d07b4..f9deb50 100644
--- a/packages/alarm-panel-esp32-base.yaml
+++ b/packages/alarm-panel-esp32-base.yaml
@@ -45,6 +45,12 @@ substitutions:
   # CONNECTION MAPPINGS
   warning_beep_pin: $out1
 
+#### GLOBALS
+globals:
+  - id: blink_on_state
+    type: bool
+    initial_value: $blink_on_state
+
 packages:
   remote_package:
     url: http://github.com/konnected-io/konnected-esphome
diff --git a/packages/alarm-panel-esp8266-base.yaml b/packages/alarm-panel-esp8266-base.yaml
index 320a357..a09fc50 100644
--- a/packages/alarm-panel-esp8266-base.yaml
+++ b/packages/alarm-panel-esp8266-base.yaml
@@ -35,6 +35,12 @@ substitutions:
   # CONNECTION MAPPINGS
   warning_beep_pin: $out
 
+#### GLOBALS
+globals:
+  - id: blink_on_state
+    type: bool
+    initial_value: $blink_on_state
+
 packages:
   remote_package:
     url: http://github.com/konnected-io/konnected-esphome
diff --git a/packages/garage-door-esp32-base.yaml b/packages/garage-door-esp32-base.yaml
index 4e0c94b..ec15c5c 100644
--- a/packages/garage-door-esp32-base.yaml
+++ b/packages/garage-door-esp32-base.yaml
@@ -50,6 +50,26 @@ substitutions:
   sda: GPIO6
   scl: GPIO7
 
+#### GLOBALS
+globals:
+  - id: blink_on_state
+    type: bool
+    initial_value: $blink_on_state
+
+  - id: gdo_err_margin
+    type: float
+    restore_value: yes
+    initial_value: $open_garage_door_distance_margin_of_error
+
+  # QC OK means the self-test has passed at least once
+  - id: qcok
+    type: bool
+    restore_value: true
+  
+  # True when self test is active
+  - id: self_test
+    type: bool
+
 packages:
 
   remote_package:
diff --git a/packages/garage-door-esp8266-base.yaml b/packages/garage-door-esp8266-base.yaml
index 072330e..775b0d4 100644
--- a/packages/garage-door-esp8266-base.yaml
+++ b/packages/garage-door-esp8266-base.yaml
@@ -51,6 +51,18 @@ substitutions:
   scl: GPIO5
 
 
+#### GLOBALS
+globals:
+  - id: blink_on_state
+    type: bool
+    initial_value: $blink_on_state
+
+  - id: gdo_err_margin
+    type: float
+    restore_value: yes
+    initial_value: $open_garage_door_distance_margin_of_error
+
+
 packages:
   remote_package:
     url: http://github.com/konnected-io/konnected-esphome
diff --git a/packages/gdo-self-test.yaml b/packages/gdo-self-test.yaml
index f62d10b..4c69cc7 100644
--- a/packages/gdo-self-test.yaml
+++ b/packages/gdo-self-test.yaml
@@ -4,17 +4,6 @@ substitutions:
   rtttl_scaleup: scale_up:d=32,o=5,b=100:c,c#,d#,e,f#,g#,a#,b
   rtttl_success: success:d=4,o=6,b=160:8e6,16f6,16g6,8a6,8g6,8e6,8g6,8a6
 
-globals:
-  # QC OK means the self-test has passed at least once
-  - id: qcok
-    type: bool
-    restore_value: true
-  
-  # True when self test is active
-  - id: self_test
-    type: bool
-
-
 esphome:
   on_boot:
     priority: 100
diff --git a/packages/status-led.yaml b/packages/status-led.yaml
index 8180b63..84c2a90 100644
--- a/packages/status-led.yaml
+++ b/packages/status-led.yaml
@@ -1,8 +1,3 @@
-globals:
-  - id: blink_on_state
-    type: bool
-    initial_value: $blink_on_state
-
 light:
   - platform: status_led
     id: blue_status_led
diff --git a/packages/vl53l0x-range-sensor.yaml b/packages/vl53l0x-range-sensor.yaml
index 610cfd8..cf69673 100644
--- a/packages/vl53l0x-range-sensor.yaml
+++ b/packages/vl53l0x-range-sensor.yaml
@@ -1,9 +1,3 @@
-globals:
-  - id: gdo_err_margin
-    type: float
-    restore_value: yes
-    initial_value: $open_garage_door_distance_margin_of_error
-
 i2c:
   sda: $sda
   scl: $scl