diff --git a/Jenkinsfile b/Jenkinsfile
index abe22b6f..1b908bdf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
             }
             post {
                 success {
-                    archiveArtifacts artifacts: 'target/Geyser.jar', fingerprint: true
+                    archiveArtifacts artifacts: 'target/*.jar', fingerprint: true
                 }
             }
         }
diff --git a/bootstrap/bukkit/pom.xml b/bootstrap/bukkit/pom.xml
index cbc0ef15..8e597635 100644
--- a/bootstrap/bukkit/pom.xml
+++ b/bootstrap/bukkit/pom.xml
@@ -25,7 +25,8 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>${outputName}-Bukkit-noshade</finalName>
+        <finalName>${outputName}-Bukkit</finalName>
+        <directory>../../target</directory>
         <defaultGoal>clean install</defaultGoal>
         <resources>
             <resource>
@@ -37,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -47,7 +48,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <finalName>${outputName}-Bukkit</finalName>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 3f26909e..5d437bbf 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -25,7 +25,8 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>${outputName}-BungeeCord-noshade</finalName>
+        <finalName>${outputName}-BungeeCord</finalName>
+        <directory>../../target</directory>
         <defaultGoal>clean install</defaultGoal>
         <resources>
             <resource>
@@ -37,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -47,7 +48,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <finalName>${outputName}-BungeeCord</finalName>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index 122b29ab..03e17895 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -19,7 +19,8 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>${outputName}-noshade</finalName>
+        <finalName>${outputName}</finalName>
+        <directory>../../target</directory>
         <defaultGoal>clean install</defaultGoal>
         <plugins>
             <plugin>
@@ -37,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -47,7 +48,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <finalName>${outputName}</finalName>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>
diff --git a/connector/pom.xml b/connector/pom.xml
index d8c42bcf..30ada454 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -118,7 +118,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/pom.xml b/pom.xml
index ce4ad9e9..e534fbc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                 </configuration>