diff --git a/configuration.yaml b/configuration.yaml
index 523c7f2..52ad27e 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -90,6 +90,18 @@ media_player:
   platform: cast
   host: 192.168.1.219
 
+garage_door:
+  platform: mqtt
+  name: 'Garage Door'
+  state_topic: 'smartthings/Garage Door/contact'
+  command_topic: 'smartthings/Garage Door/door'
+  state_open: 'open'
+  state_closed: 'closed'
+  service_open: 'open'
+  service_close: 'closed'
+  retain: true
+  optimistic: true
+
 # Discover some devices automatically
 discovery:
 
diff --git a/switches/garage.yaml b/switches/garage.yaml
index c3e7ce7..8b13789 100644
--- a/switches/garage.yaml
+++ b/switches/garage.yaml
@@ -1,7 +1 @@
-- platform: mqtt
-  name: "Garage Door"
-  state_topic: "smartthings/Garage Door/door"
-  command_topic: "smartthings/Garage Door/door"
-  payload_on: "open"
-  payload_off: "closed"
-  retain: true
+