diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 1859782194d8..581fb98a7e47 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <assembly-directory>${basedir}/target/jetty-home</assembly-directory>
     <source-assembly-directory>${basedir}/target/jetty-home-sources</source-assembly-directory>
-    <jetty-setuid-version>1.0.4</jetty-setuid-version>
+    <jetty-setuid-version>2.0.1</jetty-setuid-version>
     <spotbugs.skip>true</spotbugs.skip>
   </properties>
 
@@ -85,43 +85,6 @@
               </artifactItems>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-setuid-deps</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty.toolchain.setuid</groupId>
-                  <artifactId>jetty-setuid-java</artifactId>
-                  <version>${jetty-setuid-version}</version>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty.toolchain.setuid</groupId>
-                  <artifactId>libsetuid-linux</artifactId>
-                  <version>${jetty-setuid-version}</version>
-                  <type>so</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
-                  <destFileName>libsetuid-linux.so</destFileName>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty.toolchain.setuid</groupId>
-                  <artifactId>libsetuid-osx</artifactId>
-                  <version>${jetty-setuid-version}</version>
-                  <type>so</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
-                  <destFileName>libsetuid-osx.so</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
           <execution>
             <id>copy-jetty-core-deps</id>
             <phase>generate-resources</phase>
@@ -304,7 +267,7 @@
             <configuration>
               <!-- useful for troubleshooting the source archive of a particular file: <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> -->
               <includeGroupIds>
-                org.eclipse.jetty, org.eclipse.jetty.websocket
+                org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid
               </includeGroupIds>
               <excludeArtifactIds>jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
               <classifier>config</classifier>
@@ -629,18 +592,21 @@
       <artifactId>jetty-nosql</artifactId>
       <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.demos</groupId>
       <artifactId>jetty-demo-handler</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-keystore</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain.setuid</groupId>
+      <artifactId>jetty-setuid-jna</artifactId>
+      <version>${jetty-setuid-version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-home/src/main/resources/etc/jetty-setuid.xml b/jetty-home/src/main/resources/etc/jetty-setuid.xml
deleted file mode 100644
index 3c70cbb266f3..000000000000
--- a/jetty-home/src/main/resources/etc/jetty-setuid.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ================================================================ -->
-<!-- Configure the Jetty SetUIDListener                                -->
-<!-- ================================================================ -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <Call name="addEventListener">
-    <Arg>
-      <New class="org.eclipse.jetty.setuid.SetUIDListener">
-        <Set name="startServerAsPrivileged"><Property name="jetty.setuid.startServerAsPrivileged" default="false"/></Set>
-        <Set name="umaskOctal"><Property name="jetty.setuid.umask" default="002"/></Set>
-        <Set name="username"><Property name="jetty.setuid.userName" default="jetty"/></Set>
-        <Set name="groupname"><Property name="jetty.setuid.groupName" default="jetty"/></Set>
-        <Set name="clearSupplementalGroups">
-          <Property name="jetty.setuid.clearSupplementalGroups" default="false" />
-        </Set>
-        <!-- uncomment to change the limits on number of open file descriptors for root -->
-        <!--
-        <Call name="setRLimitNoFiles">
-          <Arg>
-            <New class="org.eclipse.jetty.setuid.RLimit">
-              <Set name="soft">20000</Set>
-              <Set name="hard">40000</Set>
-            </New>
-          </Arg>
-        </Call>
-        -->
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/jetty-home/src/main/resources/modules/setuid.mod b/jetty-home/src/main/resources/modules/setuid.mod
deleted file mode 100644
index 977cbb818690..000000000000
--- a/jetty-home/src/main/resources/modules/setuid.mod
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
-
-[description]
-Enables the UNIX setUID configuration.
-The server may be started as root to open privileged ports/files before
-changing to a restricted user (e.g. Jetty).
-
-[depend]
-server
-
-[lib]
-lib/setuid/jetty-setuid-java-1.0.4.jar
-
-[xml]
-etc/jetty-setuid.xml
-
-[ini-template]
-## SetUID Configuration
-# jetty.setuid.startServerAsPrivileged=false
-# jetty.setuid.userName=jetty
-# jetty.setuid.groupName=jetty
-# jetty.setuid.umask=002
-# jetty.setuid.clearSupplementalGroups=false