diff --git a/KotlinCore/build.gradle.kts b/KotlinCore/build.gradle.kts
index ce04fba5..5d00f0f6 100644
--- a/KotlinCore/build.gradle.kts
+++ b/KotlinCore/build.gradle.kts
@@ -18,14 +18,10 @@
  */
 
 plugins {
-    steamwar.java
-    kotlin("jvm") version "2.0.0"
+    steamwar.kotlin
     alias(libs.plugins.shadow)
 }
 
-group = "de.steamwar"
-version = ""
-
 tasks.build {
     finalizedBy(tasks.shadowJar)
 }
@@ -34,17 +30,6 @@ tasks.shadowJar {
     exclude("org/**")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-}
-
 dependencies {
-    implementation(kotlin("reflect"))
-
     compileOnly(libs.paperapi21)
 }
-
-kotlin {
-    jvmToolchain(21)
-}
\ No newline at end of file
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index b457102f..ff9b2587 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -27,4 +27,12 @@ sourceSets {
             srcDirs("src/")
         }
     }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10")
 }
\ No newline at end of file
diff --git a/buildSrc/src/steamwar.kotlin.gradle b/buildSrc/src/steamwar.kotlin.gradle
new file mode 100644
index 00000000..03b0a99d
--- /dev/null
+++ b/buildSrc/src/steamwar.kotlin.gradle
@@ -0,0 +1,56 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+plugins {
+    id "org.jetbrains.kotlin.jvm"
+}
+
+kotlin {
+    jvmToolchain(21)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+tasks.compileJava {
+    options.encoding "UTF-8"
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs("src/")
+        }
+        resources {
+            srcDirs("src/")
+            exclude("**/*.java", "**/*.kt")
+        }
+    }
+    test {
+        java {
+            srcDirs("testsrc/")
+        }
+        resources {
+            srcDirs("testsrc/")
+            exclude("**/*.java", "**/*.kt")
+        }
+    }
+}