diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
index 20d7e83..0222028 100644
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -9,7 +9,7 @@ val rootDependencyDir = "net.frankheijden.serverutils.dependencies"
 val dependencyDir = "net.frankheijden.serverutils.bukkit.dependencies"
 version = rootProject.version
 base {
-    archivesName.set("${rootProject.name}-Bukkit")
+    archivesName.set("${rootProject.name}-bukkit")
 }
 
 dependencies {
diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts
index c2b311c..3520a11 100644
--- a/Bungee/build.gradle.kts
+++ b/Bungee/build.gradle.kts
@@ -9,7 +9,7 @@ val rootDependencyDir = "net.frankheijden.serverutils.dependencies"
 val dependencyDir = "net.frankheijden.serverutils.bungee.dependencies"
 version = rootProject.version
 base {
-    archivesName.set("${rootProject.name}-Bungee")
+    archivesName.set("${rootProject.name}-bungee")
 }
 
 repositories {
diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts
index 5290a6b..a73506d 100644
--- a/Common/build.gradle.kts
+++ b/Common/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 group = rootProject.group
 version = "${rootProject.version}"
 base {
-    archivesName.set("${rootProject.name}-Common")
+    archivesName.set("${rootProject.name}-common")
 }
 
 repositories {
diff --git a/README.md b/README.md
index 27cbe74..049be4e 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-  compileOnly("org.zhdev.bukman:Bukman:VERSION")
+  compileOnly("org.zhdev.bukman:bukman:VERSION")
 }
 ```
 
@@ -44,7 +44,7 @@ dependencies {
     <!-- Bukman dependency -->
     <dependency>
       <groupId>org.zhdev.bukman</groupId>
-      <artifactId>Bukman</artifactId>
+      <artifactId>bukman</artifactId>
       <version>VERSION</version>
       <scope>provided</scope>
     </dependency>
diff --git a/Velocity/build.gradle.kts b/Velocity/build.gradle.kts
index 3b99101..1791410 100644
--- a/Velocity/build.gradle.kts
+++ b/Velocity/build.gradle.kts
@@ -8,7 +8,7 @@ group = "${rootProject.group}"
 val dependencyDir = "net.frankheijden.serverutils.velocity.dependencies"
 version = rootProject.version
 base {
-    archivesName.set("${rootProject.name}-Velocity")
+    archivesName.set("${rootProject.name}-velocity")
 }
 
 repositories {
diff --git a/build.gradle.kts b/build.gradle.kts
index a75dd83..8ad0b0a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -101,21 +101,26 @@ subprojects {
     publishing {
         repositories {
             maven {
-                name = "zhdev"
-                url = uri("https://maven.zhira.net/repository/zhdev/")
+                name = "fvdh"
+                url = if (rootProject.version.toString().endsWith("-SNAPSHOT")) {
+                    uri("https://repo.fvdh.dev/snapshots")
+                } else {
+                    uri("https://repo.fvdh.dev/releases")
+                }
+
                 credentials {
-                    username = System.getenv("MAVEN_USERNAME")
-                    password = System.getenv("MAVEN_PASSWORD")
+                    username = System.getenv("FVDH_USERNAME")
+                    password = System.getenv("FVDH_TOKEN")
                 }
             }
         }
 
         publications {
-            create<MavenPublication>("Bukman") {
+            create<MavenPublication>("bukman") {
                 artifact(tasks["shadowJar"]) {
                     classifier = ""
                 }
-                artifactId = "Bukman-$artifactId"
+                artifactId = "bukman-$artifactId"
             }
         }
     }
@@ -175,21 +180,26 @@ tasks.register<Copy>("copyJars") {
 publishing {
     repositories {
         maven {
-            name = "zhdev"
-            url = uri("https://maven.zhira.net/repository/zhdev/")
+            name = "fvdh"
+            url = if (version.toString().endsWith("-SNAPSHOT")) {
+                uri("https://repo.fvdh.dev/snapshots")
+            } else {
+                uri("https://repo.fvdh.dev/releases")
+            }
+
             credentials {
-                username = System.getenv("MAVEN_USERNAME")
-                password = System.getenv("MAVEN_PASSWORD")
+                username = System.getenv("FVDH_USERNAME")
+                password = System.getenv("FVDH_TOKEN")
             }
         }
     }
 
     publications {
-        create<MavenPublication>("Bukman") {
+        create<MavenPublication>("bukman") {
             artifact(tasks["shadowJar"]) {
                 classifier = ""
             }
-            artifactId = "Bukman"
+            artifactId = "bukman"
         }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c21b96..ab36bff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "Bukman"
+rootProject.name = "bukman"
 include("Common")
 include("Bukkit")
 include("Bungee")