diff --git a/config.json b/config.json
index eaf79dc..d8ef4be 100644
--- a/config.json
+++ b/config.json
@@ -12,6 +12,9 @@
   "chromecast": {
     "device": "default:CARD=ICUSBAUDIO7D"
   },
+  "home_assistant": {
+    "use_mopidy": false
+  },
   "mopidy": {
     "host": "media",
     "path": "/var/lib/mopidy/bin/mopidy"
@@ -224,8 +227,10 @@
     {
       "name": "announcer",
       "Name": "Announcer",
+      "home_assistant": {
+        "use_mopidy": false
+      },
       "mopidy": {
-        "http_port": "6680",
         "mpd_port": "6600",
         "mpd_only": true
       },
diff --git a/templates/home-assistant.yaml.template b/templates/home-assistant.yaml.template
index 0928a4f..7e9d568 100644
--- a/templates/home-assistant.yaml.template
+++ b/templates/home-assistant.yaml.template
@@ -1,11 +1,19 @@
 {{#zone}}
 media_player:
-  - platform: mpd
+    {{! use localhost for dev}}
+  - host: {{#dev}}localhost{{/dev}}{{^dev}}{{mopidy.host}}{{/dev}}
+    {{! use mopidy custom extension if enabled}}
+    {{#home_assistant.use_mopidy}}
     {{! use slugified name if available}}
+    name: {{#name_}}{{name_}}{{/name_}}{{^name_}}{{name}}{{/name_}}_mopidy
+    port: {{mopidy.http_port}}
+    platform: mopidy
+    {{/home_assistant.use_mopidy}}
+    {{^home_assistant.use_mopidy}}
     name: {{#name_}}{{name_}}{{/name_}}{{^name_}}{{name}}{{/name_}}_mpd
-    {{! use localhost for dev}}
-    host: {{#dev}}localhost{{/dev}}{{^dev}}{{mopidy.host}}{{/dev}}
     port: {{mopidy.mpd_port}}
+    platform: mpd
+    {{/home_assistant.use_mopidy}}
 {{#kodi}}
 
   - platform: kodi
@@ -17,7 +25,12 @@ media_player:
   - platform: group
     name: {{#name_}}{{name_}}{{/name_}}{{^name_}}{{name}}{{/name_}}_multizone_audio
     entities:
+      {{#home_assistant.use_mopidy}}
+      - media_player.{{#name_}}{{name_}}{{/name_}}{{^name_}}{{name}}{{/name_}}_mopidy
+      {{/home_assistant.use_mopidy}}
+      {{^home_assistant.use_mopidy}}
       - media_player.{{#name_}}{{name_}}{{/name_}}{{^name_}}{{name}}{{/name_}}_mpd
+      {{/home_assistant.use_mopidy}}
       {{#kodi}}
       - media_player.{{#name_}}{{name_}}{{/name_}}{{^name_}}{{name}}{{/name_}}_kodi
       {{/kodi}}