diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index cc6de22..19c9192 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -28,4 +28,4 @@ jobs:
       uses: actions/upload-artifact@v2.2.1
       with:
         name: ServerUtils
-        path: build/libs/*-all.jar
+        path: jars/*.jar
diff --git a/.gitignore b/.gitignore
index f8e72ea..8f45d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 .vs/
 .gradle/
 build/
+jars/
 *.class
 *.jar
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 36706ac..72b2ac1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,23 @@ dependencies {
 
 shadowJar {
     relocate 'dev.frankheijden.minecraftreflection', dependencyDir + '.minecraftreflection'
+    archiveFileName = "${archiveBaseName.orNull}-${archiveVersion.orNull}.${archiveExtension.orNull}"
 }
 
+def outputTasks() {
+    ["shadowJar", ":Bukkit:shadowJar", ":Bungee:shadowJar"].stream().map({ tasks.findByPath(it) })
+}
+
+task copyJars(type: Copy) {
+    outputTasks().forEach({ from(it) })
+    rename '(.*)-all.jar', '$1.jar'
+    into file('jars')
+}
+
+task cleanJars() {
+    delete file('jars')
+}
+
+clean.dependsOn cleanJars
 build.dependsOn shadowJar
+build.dependsOn copyJars
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..df8dac0
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.parallel=true
+org.gradle.jvmargs='-Dfile.encoding=UTF-8'
\ No newline at end of file