diff --git a/applications/plugins/bt_hid_app/application.fam b/applications/plugins/bt_hid_app/application.fam
index 8751e38e1..e6a3b1752 100644
--- a/applications/plugins/bt_hid_app/application.fam
+++ b/applications/plugins/bt_hid_app/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="bt_hid",
     name="Bluetooth Remote",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.PLUGIN,
     entry_point="bt_hid_app",
     stack_size=1 * 1024,
     cdefines=["APP_BLE_HID"],
diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam
index c2df4e51a..76787e097 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="music_player",
     name="Music Player",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.PLUGIN,
     entry_point="music_player_app",
     cdefines=["APP_MUSIC_PLAYER"],
     requires=[
diff --git a/applications/plugins/snake_game/application.fam b/applications/plugins/snake_game/application.fam
index b299619a5..d55f53bb1 100644
--- a/applications/plugins/snake_game/application.fam
+++ b/applications/plugins/snake_game/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="snake_game",
     name="Snake Game",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.PLUGIN,
     entry_point="snake_game_app",
     cdefines=["APP_SNAKE_GAME"],
     requires=["gui"],
diff --git a/fbt_options.py b/fbt_options.py
index 820fca871..716f99fdf 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -73,8 +73,9 @@ FIRMWARE_APPS = {
         "system_apps",
         # Settings
         "settings_apps",
-        # Plugins
-        "basic_plugins",
+        # Stock plugins - no longer built into fw, now they're .faps
+        # Yet you can still build them as a part of fw
+        # "basic_plugins",
         # Debug
         # "debug_apps",
     ],
diff --git a/site_scons/extapps.scons b/site_scons/extapps.scons
index c4df2ceed..4cb5e35cf 100644
--- a/site_scons/extapps.scons
+++ b/site_scons/extapps.scons
@@ -64,7 +64,7 @@ def build_app_as_external(env, appdef):
 
 
 apps_to_build_as_faps = [
-    # FlipperAppType.PLUGIN,
+    FlipperAppType.PLUGIN,
     FlipperAppType.EXTERNAL,
 ]
 if appenv["DEBUG_TOOLS"]: