diff --git a/common/config/api.yaml b/common/config/api.yaml
index 093c453..cd61e71 100644
--- a/common/config/api.yaml
+++ b/common/config/api.yaml
@@ -2,6 +2,6 @@
 ## https://esphome.io/components/api.html
 api:
   # Set to 0s to disable switch reboot if nothing connects to the API
-  reboot_timeout: 15min
+  reboot_timeout: ${api_reboot_timeout}
   encryption:
     key: ${encryption_key}
diff --git a/common/config/mqtt.yaml b/common/config/mqtt.yaml
index d491280..91a4a2a 100644
--- a/common/config/mqtt.yaml
+++ b/common/config/mqtt.yaml
@@ -2,7 +2,7 @@
 ## https://esphome.io/components/mqtt.html
 mqtt:
   # Set to 0s to disable switch reboot if no MQTT connection exists
-  reboot_timeout: 15min
+  reboot_timeout: ${mqtt_reboot_timeout}
   broker: ${mqtt_broker}
   username: ${mqtt_username}
   password: ${mqtt_password}