diff --git a/homeassistant/components/deconz/services.yaml b/homeassistant/components/deconz/services.yaml
index 1703037fc64..3bce097f7d3 100644
--- a/homeassistant/components/deconz/services.yaml
+++ b/homeassistant/components/deconz/services.yaml
@@ -1,32 +1,66 @@
 configure:
-  description: Set attribute of device in deCONZ. See https://home-assistant.io/integrations/deconz/#device-services for details.
+  name: Configure
+  description: >-
+    Configure attributes of either a device endpoint in deCONZ
+    or the deCONZ service itself.
   fields:
     entity:
-      description: Entity id representing a specific device in deCONZ.
+      name: Entity
+      description: Represents a specific device endpoint in deCONZ.
       example: "light.rgb_light"
+      selector:
+        entity:
+          integration: deconz
     field:
+      name: Path
+      selector:
+        text:
       description: >-
-        Field is a string representing a full path to deCONZ endpoint (when
+        String representing a full path to deCONZ endpoint (when
         entity is not specified) or a subpath of the device path for the
         entity (when entity is specified).
       example: '"/lights/1/state" or "/state"'
     data:
-      description: Data is a JSON object with what data you want to alter.
+      name: Configuration payload
+      required: true
+      selector:
+        object:
+      description: JSON object with what data you want to alter.
       example: '{"on": true}'
     bridgeid:
-      description: (Optional) Bridgeid is a string unique for each deCONZ hardware. It can be found as part of the integration name.
+      name: Bridge identifier
+      selector:
+        text:
+      description: >-
+        Unique string for each deCONZ hardware.
+        It can be found as part of the integration name.
+        Useful if you run multiple deCONZ integrations.
       example: "00212EFFFF012345"
 
 device_refresh:
-  description: Refresh device lists from deCONZ.
+  name: Device refresh
+  description: Refresh available devices from deCONZ.
   fields:
     bridgeid:
-      description: (Optional) Bridgeid is a string unique for each deCONZ hardware. It can be found as part of the integration name.
+      name: Bridge identifier
+      selector:
+        text:
+      description: >-
+        Unique string for each deCONZ hardware.
+        It can be found as part of the integration name.
+        Useful if you run multiple deCONZ integrations.
       example: "00212EFFFF012345"
 
 remove_orphaned_entries:
+  name: Remove orphaned entries
   description: Clean up device and entity registry entries orphaned by deCONZ.
   fields:
     bridgeid:
-      description: (Optional) Bridgeid is a string unique for each deCONZ hardware. It can be found as part of the integration name.
+      name: Bridge identifier
+      selector:
+        text:
+      description: >-
+        Unique string for each deCONZ hardware.
+        It can be found as part of the integration name.
+        Useful if you run multiple deCONZ integrations.
       example: "00212EFFFF012345"