diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 0d7727b3..b7ae4a6a 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -297,12 +297,12 @@ menu "Mycroft A.I. Skills"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-parrot/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-personal/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-reminder/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-simple-youtube/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-singing/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-spelling/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-unknown/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-weather/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-wikipedia-for-humans/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-wolfie/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-youtube-music/Config.in"
 endmenu
 endmenu
diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig
index 34f21bfe..87ac389e 100644
--- a/buildroot-external/configs/rpi3_64-gui_defconfig
+++ b/buildroot-external/configs/rpi3_64-gui_defconfig
@@ -753,10 +753,10 @@ BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y
 BR2_PACKAGE_MYCROFT_SKILL_PARROT=y
 BR2_PACKAGE_MYCROFT_SKILL_PERSONAL=y
 BR2_PACKAGE_MYCROFT_SKILL_REMINDER=y
-BR2_PACKAGE_MYCROFT_SKILL_SIMPLE_YOUTUBE=y
 BR2_PACKAGE_MYCROFT_SKILL_SINGING=y
 BR2_PACKAGE_MYCROFT_SKILL_SPELLING=y
 BR2_PACKAGE_MYCROFT_SKILL_UNKNOWN=y
 BR2_PACKAGE_MYCROFT_SKILL_WEATHER=y
 BR2_PACKAGE_MYCROFT_SKILL_WIKIPEDIA_FOR_HUMANS=y
 BR2_PACKAGE_MYCROFT_SKILL_WOLFIE=y
+BR2_PACKAGE_MYCROFT_SKILL_YOUTUBE_MUSIC=y
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index f35d79eb..83893a5b 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -755,10 +755,10 @@ BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y
 BR2_PACKAGE_MYCROFT_SKILL_PARROT=y
 BR2_PACKAGE_MYCROFT_SKILL_PERSONAL=y
 BR2_PACKAGE_MYCROFT_SKILL_REMINDER=y
-BR2_PACKAGE_MYCROFT_SKILL_SIMPLE_YOUTUBE=y
 BR2_PACKAGE_MYCROFT_SKILL_SINGING=y
 BR2_PACKAGE_MYCROFT_SKILL_SPELLING=y
 BR2_PACKAGE_MYCROFT_SKILL_UNKNOWN=y
 BR2_PACKAGE_MYCROFT_SKILL_WEATHER=y
 BR2_PACKAGE_MYCROFT_SKILL_WIKIPEDIA_FOR_HUMANS=y
 BR2_PACKAGE_MYCROFT_SKILL_WOLFIE=y
+BR2_PACKAGE_MYCROFT_SKILL_YOUTUBE_MUSIC=y
diff --git a/buildroot-external/package/mycroft-skill-simple-youtube/Config.in b/buildroot-external/package/mycroft-skill-simple-youtube/Config.in
deleted file mode 100644
index 4ae21166..00000000
--- a/buildroot-external/package/mycroft-skill-simple-youtube/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_MYCROFT_SKILL_SIMPLE_YOUTUBE
-	bool "mycroft-skill-simple-youtube"
-	help
-	  play music from youtube in mycroft
-
-	  https://github.com/JarbasSkills/skill-simple-youtube
diff --git a/buildroot-external/package/mycroft-skill-simple-youtube/mycroft-skill-simple-youtube.mk b/buildroot-external/package/mycroft-skill-simple-youtube/mycroft-skill-simple-youtube.mk
deleted file mode 100644
index 538d9c39..00000000
--- a/buildroot-external/package/mycroft-skill-simple-youtube/mycroft-skill-simple-youtube.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#
-# mycroft-skill-simple-youtube
-#
-################################################################################
-
-MYCROFT_SKILL_SIMPLE_YOUTUBE_VERSION = 9c01487e8094a3f575e9d9ee212c6ee55335d7dc
-MYCROFT_SKILL_SIMPLE_YOUTUBE_SITE = https://github.com/JarbasSkills/skill-simple-youtube
-MYCROFT_SKILL_SIMPLE_YOUTUBE_SITE_METHOD = git
-MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
-MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRNAME = skill-simple-youtube.jarbasskills
-
-define MYCROFT_SKILL_SIMPLE_YOUTUBE_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRLOCATION)/$(MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRNAME)
-	cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRLOCATION)/$(MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRNAME)
-	cp -dpfr $(MYCROFT_SKILL_SIMPLE_YOUTUBE_DL_DIR)/git/.git* \
-		$(TARGET_DIR)/$(MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRLOCATION)/$(MYCROFT_SKILL_SIMPLE_YOUTUBE_DIRNAME)
-endef
-
-$(eval $(generic-package))
diff --git a/buildroot-external/package/mycroft-skill-youtube-music/Config.in b/buildroot-external/package/mycroft-skill-youtube-music/Config.in
new file mode 100644
index 00000000..d5a77f2c
--- /dev/null
+++ b/buildroot-external/package/mycroft-skill-youtube-music/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MYCROFT_SKILL_YOUTUBE_MUSIC
+	bool "mycroft-skill-youtube-music"
+	help
+	  play music from youtube in mycroft
+
+	  https://github.com/JarbasSkills/skill-youtube-music
diff --git a/buildroot-external/package/mycroft-skill-youtube-music/mycroft-skill-youtube-music.mk b/buildroot-external/package/mycroft-skill-youtube-music/mycroft-skill-youtube-music.mk
new file mode 100644
index 00000000..f867a9ac
--- /dev/null
+++ b/buildroot-external/package/mycroft-skill-youtube-music/mycroft-skill-youtube-music.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# mycroft-skill-youtube-music
+#
+################################################################################
+
+MYCROFT_SKILL_YOUTUBE_MUSIC_VERSION = 85e0cace9e8666aeb3317865802473f78010869c
+MYCROFT_SKILL_YOUTUBE_MUSIC_SITE = https://github.com/JarbasSkills/skill-youtube-music
+MYCROFT_SKILL_YOUTUBE_MUSIC_SITE_METHOD = git
+MYCROFT_SKILL_YOUTUBE_MUSIC_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
+MYCROFT_SKILL_YOUTUBE_MUSIC_DIRNAME = skill-youtube-music.jarbasskills
+
+define MYCROFT_SKILL_YOUTUBE_MUSIC_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_YOUTUBE_MUSIC_DIRLOCATION)/$(MYCROFT_SKILL_YOUTUBE_MUSIC_DIRNAME)
+	cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_YOUTUBE_MUSIC_DIRLOCATION)/$(MYCROFT_SKILL_YOUTUBE_MUSIC_DIRNAME)
+	cp -dpfr $(MYCROFT_SKILL_YOUTUBE_MUSIC_DL_DIR)/git/.git* \
+		$(TARGET_DIR)/$(MYCROFT_SKILL_YOUTUBE_MUSIC_DIRLOCATION)/$(MYCROFT_SKILL_YOUTUBE_MUSIC_DIRNAME)
+endef
+
+$(eval $(generic-package))