diff --git a/src/components/ha-stt-picker.ts b/src/components/ha-stt-picker.ts
index 01e909c527..d4b87e1cc7 100644
--- a/src/components/ha-stt-picker.ts
+++ b/src/components/ha-stt-picker.ts
@@ -20,8 +20,6 @@ import { computeDomain } from "../common/entity/compute_domain";
 
 const NONE = "__NONE_OPTION__";
 
-const NAME_MAP = { cloud: "Home Assistant Cloud" };
-
 @customElement("ha-stt-picker")
 export class HaSTTPicker extends LitElement {
   @property() public value?: string;
@@ -86,12 +84,15 @@ export class HaSTTPicker extends LitElement {
             </ha-list-item>`
           : nothing}
         ${this._engines.map((engine) => {
-          let label = engine.engine_id;
+          if (engine.deprecated && engine.engine_id !== value) {
+            return nothing;
+          }
+          let label: string;
           if (engine.engine_id.includes(".")) {
             const stateObj = this.hass!.states[engine.engine_id];
             label = stateObj ? computeStateName(stateObj) : engine.engine_id;
-          } else if (engine.engine_id in NAME_MAP) {
-            label = NAME_MAP[engine.engine_id];
+          } else {
+            label = engine.name || engine.engine_id;
           }
           return html`<ha-list-item
             .value=${engine.engine_id}
diff --git a/src/components/ha-tts-picker.ts b/src/components/ha-tts-picker.ts
index 7872fc44ef..90bca8bf89 100644
--- a/src/components/ha-tts-picker.ts
+++ b/src/components/ha-tts-picker.ts
@@ -20,11 +20,6 @@ import { computeDomain } from "../common/entity/compute_domain";
 
 const NONE = "__NONE_OPTION__";
 
-const NAME_MAP = {
-  cloud: "Home Assistant Cloud",
-  google_translate: "Google Translate",
-};
-
 @customElement("ha-tts-picker")
 export class HaTTSPicker extends LitElement {
   @property() public value?: string;
@@ -89,12 +84,15 @@ export class HaTTSPicker extends LitElement {
             </ha-list-item>`
           : nothing}
         ${this._engines.map((engine) => {
-          let label = engine.engine_id;
+          if (engine.deprecated && engine.engine_id !== value) {
+            return nothing;
+          }
+          let label: string;
           if (engine.engine_id.includes(".")) {
             const stateObj = this.hass!.states[engine.engine_id];
             label = stateObj ? computeStateName(stateObj) : engine.engine_id;
-          } else if (engine.engine_id in NAME_MAP) {
-            label = NAME_MAP[engine.engine_id];
+          } else {
+            label = engine.name || engine.engine_id;
           }
           return html`<ha-list-item
             .value=${engine.engine_id}
diff --git a/src/data/stt.ts b/src/data/stt.ts
index ac1d9006ad..58cdff5b5c 100644
--- a/src/data/stt.ts
+++ b/src/data/stt.ts
@@ -21,6 +21,8 @@ export interface SpeechMetadata {
 export interface STTEngine {
   engine_id: string;
   supported_languages?: string[];
+  name?: string;
+  deprecated: boolean;
 }
 
 export const listSTTEngines = (
diff --git a/src/data/tts.ts b/src/data/tts.ts
index 4e1a85a506..b95c12cc3b 100644
--- a/src/data/tts.ts
+++ b/src/data/tts.ts
@@ -3,6 +3,8 @@ import { HomeAssistant } from "../types";
 export interface TTSEngine {
   engine_id: string;
   supported_languages?: string[];
+  name?: string;
+  deprecated: boolean;
 }
 
 export interface TTSVoice {