diff --git a/firmware/addons/runtime-config.yaml b/firmware/addons/runtime-config.yaml
index b2afbcc..60b015a 100644
--- a/firmware/addons/runtime-config.yaml
+++ b/firmware/addons/runtime-config.yaml
@@ -1,17 +1,4 @@
 select:
-  - platform: template
-    name: "Height Decoder Variant"
-    entity_category: "config"
-    optimistic: true
-    restore_value: true
-    options:
-      - uplift
-      - jarvis
-      - omnidesk
-    initial_option: ${standing_desk_variant}
-    on_value:
-      then:
-        lambda: "id(desk_height)->set_decoder_variant(x);"
   - platform: template
     name: "Height Units"
     entity_category: "config"
diff --git a/firmware/base.yaml b/firmware/base.yaml
index f746358..cae96d1 100644
--- a/firmware/base.yaml
+++ b/firmware/base.yaml
@@ -32,7 +32,6 @@ substitutions:
   standing_desk_uart_rx_pin: "17"
   standing_desk_up_pin: "21"
   standing_desk_down_pin: "22"
-  standing_desk_variant: "uplift"
   standing_desk_min_height: "25.2"
   standing_desk_max_height: "50.8"
 
@@ -46,7 +45,7 @@ substitutions:
   default_height_units: "in" # Must be "in" or "cm"
 
 packages:
-  standing_desk: github://tjhorner/esphome-standing-desk/configs/template.yaml@master
+  standing_desk: github://tjhorner/esphome-standing-desk/configs/template.yaml@auto-detection
   addon_presets: !include addons/presets.yaml
   addon_stable_ids: !include addons/stable-ids.yaml
   addon_runtime_config: !include addons/runtime-config.yaml