diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
index 183ac51e..c96733e0 100644
--- a/.github/workflows/javadoc.yml
+++ b/.github/workflows/javadoc.yml
@@ -19,7 +19,7 @@ jobs:
           java-version: '17'
           check-latest: true
       - name: Build Javadoc
-        run: mvn javadoc:javadoc
+        run: mvn -B -V javadoc:javadoc --file pom.xml
       - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@v4
         with:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 77cdc4f7..ba2a157d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -4,6 +4,7 @@
 name: Java CI with Maven
 
 on:
+  workflow_dispatch:
   push:
     branches: [ master ]
     paths-ignore: 
@@ -13,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         java: ['8', '11', '17']
@@ -33,12 +34,13 @@ jobs:
         java-version: '17'
         check-latest: true
     - name: Build with Maven
-      run: mvn -B -DskipTests=true package --file pom.xml
+      run: mvn -B -V -DskipTests=true package --file pom.xml
     - uses: actions/upload-artifact@v3
       with:
         name: java-${{ matrix.java }}-jars
         path: |
           **/target/*.jar
+          **/target/bom.*
       if: always()
     - name: Set up test JDK ${{ matrix.java }}
       uses: actions/setup-java@v3
@@ -47,7 +49,7 @@ jobs:
         java-version: ${{ matrix.java }}
         check-latest: true
     - name: Test with Maven
-      run: mvn -B -P coverage verify -Denforcer.skip=true -Dmaven.resources.skip=true -Dmaven.main.skip=true -Dassembly.skipAssembly=true -Dmaven.javadoc.skip=true -DskipITs=false --file pom.xml
+      run: mvn -B -V -P coverage verify -Denforcer.skip=true -Dmaven.resources.skip=true -Dmaven.main.skip=true -Dassembly.skipAssembly=true -Dmaven.javadoc.skip=true -DskipITs=false --file pom.xml
     - uses: actions/upload-artifact@v3
       with:
         name: java-${{ matrix.java }}-testresults
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index ca5ab4ba..6686a643 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/pom.xml b/pom.xml
index 129c4486..5bb599b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
             <url>https://github.com/mwiede/jsch/blob/master/LICENSE.txt</url>
         </license>
         <license>
-            <name>BSD</name>
+            <name>Revised BSD</name>
             <url>https://github.com/mwiede/jsch/blob/master/LICENSE.JZlib.txt</url>
         </license>
         <license>
@@ -92,18 +92,6 @@
             <version>${junixsocket.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.kohlschutter.junixsocket</groupId>
-            <artifactId>junixsocket-native-common</artifactId>
-            <version>${junixsocket.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.kohlschutter</groupId>
-            <artifactId>compiler-annotations</artifactId>
-            <version>1.5.2</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-jpms</artifactId>
@@ -163,6 +151,12 @@
             <version>1.15</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.kohlschutter.junixsocket</groupId>
+            <artifactId>junixsocket-native-common</artifactId>
+            <version>${junixsocket.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -207,6 +201,9 @@
                                     <version>16</version>
                                 </requireJavaVersion>
                                 <dependencyConvergence />
+                                <banDuplicatePomDependencyVersions />
+                                <reactorModuleConvergence />
+                                <requireUpperBoundDeps />
                             </rules>
                         </configuration>
                     </execution>
@@ -273,12 +270,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <fork>true</fork>
                     <release>8</release>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                     <compilerArgs>
-                        <arg>-Xlint:all,-processing</arg>
+                        <arg>-Xlint:all,-processing,-classfile</arg>
                         <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
@@ -480,6 +476,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.cyclonedx</groupId>
+                <artifactId>cyclonedx-maven-plugin</artifactId>
+                <version>2.7.5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>makeBom</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -489,6 +497,11 @@
                     <releaseProfiles>release</releaseProfiles>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>3.0.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -509,6 +522,28 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>3.5.0</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.2.1</version>
+                <configuration>
+                    <failOnViolation>true</failOnViolation>
+                    <logViolationsToConsole>true</logViolationsToConsole>
+                    <violationSeverity>warning</violationSeverity>
+                    <configLocation>google_checks.xml</configLocation>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                        <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/examples</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/src/main/java9</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/src/main/java10</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/src/main/java11</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/src/main/java15</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/src/main/java16</sourceDirectory>
+                        <sourceDirectory>${project.basedir}/src/main/java-templates</sourceDirectory>
+                    </sourceDirectories>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
@@ -529,6 +564,19 @@
                     </directories>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.8</version>
+                <configuration>
+                    <excludes>
+                        <exclude>com/jcraft/jsch/JavaVersion.class</exclude>
+                        <exclude>com/jcraft/jsch/UnixDomainSocketFactory.class</exclude>
+                        <exclude>META-INF/versions/9/com/jcraft/jsch/JavaVersion.class</exclude>
+                        <exclude>META-INF/versions/10/com/jcraft/jsch/JavaVersion.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -539,7 +587,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -560,15 +607,6 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.8</version>
-                        <configuration>
-                            <excludes>
-                                <exclude>com/jcraft/jsch/JavaVersion.class</exclude>
-                                <exclude>com/jcraft/jsch/UnixDomainSocketFactory.class</exclude>
-                                <exclude>META-INF/versions/9/com/jcraft/jsch/JavaVersion.class</exclude>
-                                <exclude>META-INF/versions/10/com/jcraft/jsch/JavaVersion.class</exclude>
-                            </excludes>
-                        </configuration>
                         <executions>
                             <execution>
                                 <id>default-prepare-agent</id>
@@ -607,6 +645,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
+                            <fork>true</fork>
                             <compilerArgs combine.children="append">
                                 <arg>-XDcompilePolicy=simple</arg>
                                 <arg>-Xplugin:ErrorProne</arg>
@@ -624,7 +663,7 @@
                                 <path>
                                     <groupId>com.google.errorprone</groupId>
                                     <artifactId>error_prone_core</artifactId>
-                                    <version>2.17.0</version>
+                                    <version>2.18.0</version>
                                 </path>
                             </annotationProcessorPaths>
                         </configuration>
@@ -680,25 +719,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.2.1</version>
-                        <configuration>
-                            <encoding>UTF-8</encoding>
-                            <failOnViolation>true</failOnViolation>
-                            <logViolationsToConsole>true</logViolationsToConsole>
-                            <violationSeverity>warning</violationSeverity>
-                            <configLocation>google_checks.xml</configLocation>
-                            <sourceDirectories>
-                                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                                <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/examples</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/src/main/java9</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/src/main/java10</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/src/main/java11</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/src/main/java15</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/src/main/java16</sourceDirectory>
-                                <sourceDirectory>${project.basedir}/src/main/java-templates</sourceDirectory>
-                            </sourceDirectories>
-                        </configuration>
                         <executions>
                             <execution>
                                 <id>validate</id>
diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
index a245540d..28e87027 100644
--- a/src/main/java9/module-info.java
+++ b/src/main/java9/module-info.java
@@ -7,7 +7,6 @@
     requires static org.slf4j;
     requires static org.bouncycastle.provider;
     requires static org.newsclub.net.unix;
-    requires static com.kohlschutter.junixsocket.nativecommon;
     requires static com.sun.jna;
     requires static com.sun.jna.platform;
 }
diff --git a/src/test/resources/docker/Dockerfile.sshagent b/src/test/resources/docker/Dockerfile.sshagent
index f695ab3f..b73d917f 100644
--- a/src/test/resources/docker/Dockerfile.sshagent
+++ b/src/test/resources/docker/Dockerfile.sshagent
@@ -5,6 +5,9 @@ RUN apk update && \
     apk upgrade && \
     apk add openssh su-exec && \
     rm /var/cache/apk/* && \
+    if [ "$testuid" -gt 0 ]; then if egrep "^[^:]+:x:$testuid:" /etc/passwd; then deluser "$(egrep "^[^:]+:x:$testuid:" /etc/passwd | cut -d: -f1)"; fi; fi && \
+    if [ "$testgid" -gt 0 ]; then if egrep "^[^:]+:x:[^:]+:$testgid:" /etc/passwd; then deluser "$(egrep "^[^:]+:x:[^:]+:$testgid:" /etc/passwd | cut -d: -f1)"; fi; fi && \
+    if [ "$testgid" -gt 0 ]; then if egrep "^[^:]+:x:$testgid:" /etc/group; then delgroup "$(egrep "^[^:]+:x:$testgid:" /etc/group | cut -d: -f1)"; fi; fi && \
     addgroup -g $testgid testuser && \
     adduser -Du $testuid -G testuser -Hh /testuser -s /bin/sh -g testuser testuser && \
     mkdir /testuser && \