diff --git a/esphome/m5stack-atom-echo.yaml b/esphome/m5stack-atom-echo.yaml
index da17c7d..705c1cb 100644
--- a/esphome/m5stack-atom-echo.yaml
+++ b/esphome/m5stack-atom-echo.yaml
@@ -56,7 +56,6 @@ microphone:
 
 voice_assistant:
   microphone: echo_microphone
-  speaker: atom_echo_speaker
   on_start:
     - light.turn_on:
         id: led
@@ -72,6 +71,7 @@ voice_assistant:
         green: 100%
         effect: none
   on_tts_end:
+    - media_player.play_media: !lambda return x;
     - light.turn_on:
         id: led
         blue: 0%
@@ -82,7 +82,7 @@ voice_assistant:
     - delay: 1s
     - wait_until:
         not:
-          speaker.is_playing: atom_echo_speaker
+          media_player.is_playing: media_out
     - light.turn_off: led
   on_error:
     - light.turn_on:
@@ -125,13 +125,6 @@ media_player:
     i2s_dout_pin: GPIO22
     mode: mono
 
-speaker:
-  - platform: i2s_audio
-    id: atom_echo_speaker
-    dac_type: external
-    i2s_dout_pin: GPIO22
-    mode: mono
-
 light:
   - platform: esp32_rmt_led_strip
     id: led
@@ -145,4 +138,4 @@ light:
     effects:
       - pulse:
           transition_length: 250ms
-          update_interval: 250ms
+          update_interval: 250ms
\ No newline at end of file
diff --git a/esphome/raspiaudio-muse-luxe.yaml b/esphome/raspiaudio-muse-luxe.yaml
index a14477e..e69cd05 100644
--- a/esphome/raspiaudio-muse-luxe.yaml
+++ b/esphome/raspiaudio-muse-luxe.yaml
@@ -74,13 +74,6 @@ media_player:
       number: GPIO21
       inverted: true
 
-speaker:
-  - platform: i2s_audio
-    id: luxe_out_speaker
-    dac_type: external
-    i2s_dout_pin: GPIO26
-    mode: stereo
-
 microphone:
   - platform: i2s_audio
     id: luxe_microphone
@@ -205,4 +198,4 @@ light:
     effects:
       - pulse:
           transition_length: 250ms
-          update_interval: 250ms
+          update_interval: 250ms
\ No newline at end of file