diff --git a/bot.py b/bot.py
index f832f5c..7c59959 100644
--- a/bot.py
+++ b/bot.py
@@ -120,7 +120,7 @@ def user_entrance_sound_autocomplete(
     """
     boards: List[str] = os.listdir(SOUNDDIR)
     all_sounds: Dict[str, List[str]] = {
-        board: list(map(lambda x: x.split(".")[0], os.listdir(f"{SOUNDDIR}/{board}/")))
+        board: os.listdir(f"{SOUNDDIR}/{board}/")
         for board in boards
     }  # These are all sounds, organized per board, without file extension
 
@@ -133,7 +133,7 @@ def user_entrance_sound_autocomplete(
         for sound in board_sounds:  # Iterate over board specific sounds
             soundpath = f"{board}/{sound}"
             if soundpath.lower().startswith(current.lower()):
-                completions += [Choice(name=soundpath, value=soundpath)]
+                completions += [Choice(name=soundpath.split(".")[0], value=soundpath)]
 
     return completions
 
@@ -268,12 +268,10 @@ async def sound_autocomplete(
     Suggest a sound from an already selected board.
     """
     board: str = interaction.namespace.board
-    sounds: List[str] = list(
-        map(lambda x: x.split(".")[0], os.listdir(f"{SOUNDDIR}/{board}/"))
-    )
+    sounds: List[str] = os.listdir(f"{SOUNDDIR}/{board}/")
 
     return [
-        Choice(name=sound, value=sound)
+        Choice(name=sound.split(".")[0], value=sound)
         for sound in sounds
         if sound.lower().startswith(current.lower())
     ]
diff --git a/heidi_helpers.py b/heidi_helpers.py
index a424db8..8c817c3 100644
--- a/heidi_helpers.py
+++ b/heidi_helpers.py
@@ -19,9 +19,9 @@ async def play_voice_line(
     Play a voice line in the specified channel.
     """
     try:
-        open(f"{SOUNDDIR}/{board}/{sound}.mkv")
+        open(f"{SOUNDDIR}/{board}/{sound}")
     except IOError:
-        print("Error: Invalid soundfile!")
+        print(f"Error: Invalid soundfile {SOUNDDIR}/{board}/{sound}!")
         if interaction is not None:
             await interaction.response.send_message(
                 f'Heidi sagt: "{board}/{sound}" kanninich finden bruder'
@@ -32,7 +32,7 @@ async def play_voice_line(
         await interaction.response.send_message(f'Heidi sagt: "{board}/{sound}"')
 
     audio_source = discord.FFmpegPCMAudio(
-        f"{SOUNDDIR}/{board}/{sound}.mkv"
+        f"{SOUNDDIR}/{board}/{sound}"
     )  # only works from docker
     voice_client = await voice_channel.connect()
     voice_client.play(audio_source)