diff --git a/homeassistant/components/logbook/services.yaml b/homeassistant/components/logbook/services.yaml
index fb1736d7784..252b0b6a39b 100644
--- a/homeassistant/components/logbook/services.yaml
+++ b/homeassistant/components/logbook/services.yaml
@@ -1,15 +1,29 @@
 log:
-  description: Create a custom entry in your logbook.
+  description: Create a custom entry in your logbook
   fields:
     name:
+      name: Name
       description: Custom name for an entity, can be referenced with entity_id
+      required: true
       example: "Kitchen"
+      selector:
+        text:
     message:
+      name: Message
       description: Message of the custom logbook entry
+      required: true
       example: "is being used"
+      selector:
+        text:
     entity_id:
+      name: Entity ID
       description: Entity to reference in custom logbook entry [Optional]
       example: "light.kitchen"
+      selector:
+        entity:
     domain:
+      name: Domain
       description: Icon of domain to display in custom logbook entry [Optional]
       example: "light"
+      selector:
+        text:
diff --git a/homeassistant/components/logger/services.yaml b/homeassistant/components/logger/services.yaml
index 514aac4c71c..4bd46b4b01e 100644
--- a/homeassistant/components/logger/services.yaml
+++ b/homeassistant/components/logger/services.yaml
@@ -1,22 +1,43 @@
 set_default_level:
-  description: Set the default log level for components.
+  description: Set the default log level for components
   fields:
     level:
-      description: "Default severity level. Possible values are debug, info, warn, warning, error, fatal, critical"
+      name: Level
+      description:
+        "Default severity level. Possible values are debug, info, warn, warning,
+        error, fatal, critical"
       example: debug
+      selector:
+        select:
+          options:
+            - debug
+            - info
+            - warning
+            - error
+            - fatal
+            - critical
 
 set_level:
-  description: Set log level for components.
+  description: Set log level for components
   fields:
     homeassistant.core:
-      description: "Example on how to change the logging level for a Home Assistant core components. Possible values are debug, info, warn, warning, error, fatal, critical"
+      description:
+        "Example on how to change the logging level for a Home Assistant core
+        components. Possible values are debug, info, warn, warning, error,
+        fatal, critical"
       example: debug
     homeassistant.components.mqtt:
-      description: "Example on how to change the logging level for an Integration. Possible values are debug, info, warn, warning, error, fatal, critical"
+      description:
+        "Example on how to change the logging level for an Integration. Possible
+        values are debug, info, warn, warning, error, fatal, critical"
       example: warning
     custom_components.my_integration:
-      description: "Example on how to change the logging level for a Custom Integration. Possible values are debug, info, warn, warning, error, fatal, critical"
+      description:
+        "Example on how to change the logging level for a Custom Integration.
+        Possible values are debug, info, warn, warning, error, fatal, critical"
       example: debug
     aiohttp:
-      description: "Example on how to change the logging level for a Python module. Possible values are debug, info, warn, warning, error, fatal, critical"
+      description:
+        "Example on how to change the logging level for a Python module.
+        Possible values are debug, info, warn, warning, error, fatal, critical"
       example: error
diff --git a/homeassistant/components/system_log/services.yaml b/homeassistant/components/system_log/services.yaml
index 2545d47c825..e07aea9c2a1 100644
--- a/homeassistant/components/system_log/services.yaml
+++ b/homeassistant/components/system_log/services.yaml
@@ -1,15 +1,34 @@
 clear:
-  description: Clear all log entries.
+  description: Clear all log entries
 
 write:
-  description: Write log entry.
+  description: Write log entry
   fields:
     message:
-      description: Message to log. [Required]
+      name: Message
+      description: Message to log.
+      required: true
       example: Something went wrong
+      selector:
+        text:
     level:
-      description: "Log level: debug, info, warning, error, critical. Defaults to 'error'."
+      name: Level
+      description: "Log level: debug, info, warning, error, critical."
+      default: error
       example: debug
+      selector:
+        select:
+          options:
+            - "debug"
+            - "info"
+            - "warning"
+            - "error"
+            - "critical"
     logger:
-      description: Logger name under which to log the message. Defaults to 'system_log.external'.
+      name: Logger
+      description:
+        Logger name under which to log the message. Defaults to
+        'system_log.external'.
       example: mycomponent.myplatform
+      selector:
+        text: