diff --git a/paper-server/src/main/java/io/papermc/paper/command/PaperCommands.java b/paper-server/src/main/java/io/papermc/paper/command/PaperCommands.java
index eeefb915d4..6dfd0b1a85 100644
--- a/paper-server/src/main/java/io/papermc/paper/command/PaperCommands.java
+++ b/paper-server/src/main/java/io/papermc/paper/command/PaperCommands.java
@@ -28,12 +28,12 @@ public final class PaperCommands {
         COMMANDS.forEach((s, command) -> {
             server.server.getCommandMap().register(s, "Paper", command);
         });
-        server.server.getCommandMap().register("bukkit", new PaperPluginsCommand());
     }
 
     public static void registerCommands() {
         // Paper commands go here
         registerInternalCommand(PaperVersionCommand.create(), "bukkit", PaperVersionCommand.DESCRIPTION, List.of("ver", "about"), Set.of());
+        registerInternalCommand(PaperPluginsCommand.create(), "bukkit", PaperPluginsCommand.DESCRIPTION, List.of("pl"), Set.of());
     }
 
     private static void registerInternalCommand(final LiteralCommandNode<CommandSourceStack> node, final String namespace, final String description, final List<String> aliases, final Set<CommandRegistrationFlag> flags) {
diff --git a/paper-server/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/paper-server/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
index 41c95f00b4..d0a4e1642d 100644
--- a/paper-server/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
+++ b/paper-server/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
@@ -1,8 +1,13 @@
 package io.papermc.paper.command;
 
 import com.google.common.collect.Lists;
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.tree.LiteralCommandNode;
 import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.TypeToken;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.Commands;
 import io.papermc.paper.plugin.configuration.PluginMeta;
 import io.papermc.paper.plugin.entrypoint.Entrypoint;
 import io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler;
@@ -13,7 +18,6 @@ import io.papermc.paper.plugin.provider.type.paper.PaperPluginParent;
 import io.papermc.paper.plugin.provider.type.spigot.SpigotPluginProvider;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.TreeMap;
 import net.kyori.adventure.text.Component;
@@ -24,15 +28,15 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.defaults.BukkitCommand;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
-public class PaperPluginsCommand extends BukkitCommand {
-
+public class PaperPluginsCommand {
+    public static final String DESCRIPTION = "Gets a list of plugins running on the server";
+    
     private static final TextColor INFO_COLOR = TextColor.color(52, 159, 218);
 
     private static final Component SERVER_PLUGIN_INFO = Component.text("ℹ What is a server plugin?", INFO_COLOR)
@@ -62,12 +66,12 @@ public class PaperPluginsCommand extends BukkitCommand {
 
     private static final Type JAVA_PLUGIN_PROVIDER_TYPE = new TypeToken<PluginProvider<JavaPlugin>>() {}.getType();
 
-    public PaperPluginsCommand() {
-        super("plugins");
-        this.description = "Gets a list of plugins running on the server";
-        this.usageMessage = "/plugins";
-        this.setPermission("bukkit.command.plugins");
-        this.setAliases(List.of("pl"));
+    public static LiteralCommandNode<CommandSourceStack> create() {
+        final PaperPluginsCommand command = new PaperPluginsCommand();
+        return Commands.literal("plugins")
+            .requires(source -> source.getSender().hasPermission("bukkit.command.plugins"))
+            .executes(command::execute)
+            .build();
     }
 
     private static <T> List<Component> formatProviders(final TreeMap<String, PluginProvider<T>> plugins) {
@@ -165,11 +169,9 @@ public class PaperPluginsCommand extends BukkitCommand {
             return NamedTextColor.RED;
         }
     }
-
-    @Override
-    public boolean execute(final CommandSender sender, final String currentAlias, final String[] args) {
-        if (!this.testPermission(sender)) return true;
-
+    
+    private int execute(CommandContext<CommandSourceStack> context) {
+        final CommandSender sender = context.getSource().getSender();
         final TreeMap<String, PluginProvider<JavaPlugin>> paperPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         final TreeMap<String, PluginProvider<JavaPlugin>> spigotPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
@@ -208,11 +210,6 @@ public class PaperPluginsCommand extends BukkitCommand {
             sender.sendMessage(component);
         }
 
-        return true;
-    }
-
-    @Override
-    public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args) throws IllegalArgumentException {
-        return Collections.emptyList();
+        return Command.SINGLE_SUCCESS;
     }
 }