diff --git a/homeassistant/components/template/button.py b/homeassistant/components/template/button.py
index 52435d88971..67ce7e7a16b 100644
--- a/homeassistant/components/template/button.py
+++ b/homeassistant/components/template/button.py
@@ -51,7 +51,7 @@ BUTTON_SCHEMA = (
 CONFIG_BUTTON_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_NAME): cv.template,
-        vol.Optional(CONF_PRESS): selector.ActionSelector(),
+        vol.Optional(CONF_PRESS): cv.SCRIPT_SCHEMA,
         vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
         vol.Optional(CONF_DEVICE_ID): selector.DeviceSelector(),
     }
diff --git a/homeassistant/components/template/switch.py b/homeassistant/components/template/switch.py
index 9145625f706..bddb51e5e67 100644
--- a/homeassistant/components/template/switch.py
+++ b/homeassistant/components/template/switch.py
@@ -64,8 +64,8 @@ SWITCH_CONFIG_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_NAME): cv.template,
         vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
-        vol.Optional(CONF_TURN_ON): selector.ActionSelector(),
-        vol.Optional(CONF_TURN_OFF): selector.ActionSelector(),
+        vol.Optional(CONF_TURN_ON): cv.SCRIPT_SCHEMA,
+        vol.Optional(CONF_TURN_OFF): cv.SCRIPT_SCHEMA,
         vol.Optional(CONF_DEVICE_ID): selector.DeviceSelector(),
     }
 )