diff --git a/api/src/main/java/com/velocitypowered/api/util/buildinfo/ServerBuildInfo.java b/api/src/main/java/com/velocitypowered/api/util/buildinfo/ServerBuildInfo.java
index 4a87b249d2..df60a8c6eb 100644
--- a/api/src/main/java/com/velocitypowered/api/util/buildinfo/ServerBuildInfo.java
+++ b/api/src/main/java/com/velocitypowered/api/util/buildinfo/ServerBuildInfo.java
@@ -29,6 +29,7 @@ public interface ServerBuildInfo {
   *
   * @return the {@code ServerBuildInfo}
   */
+  // TODO: This works but, I have no clue if this is correct codewise
   static <T extends ServerBuildInfo> @NotNull T buildInfo() {
     //<editor-fold defaultstate="collapsed" desc="Holder">
     /**
diff --git a/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts b/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
index c64eed3d9f..024272df8e 100644
--- a/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
+++ b/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
@@ -14,6 +14,7 @@ tasks.withType<Jar> {
         val gitHash = indraGit.commit()?.name?.substring(0, 8) ?: "unknown"
         val gitBranch = indraGit.branchName() ?: "unknown"
         val velocityVersion = project.version.toString()
+        val velocityVersionButWithoutTheDashSnapshot = velocityVersion.replace("-SNAPSHOT", "")
         val implementationVersion = "$velocityVersion-${buildNumber ?: "DEV"}-$gitHash"
         val velocityHumanVersion: String =
             if (project.version.toString().endsWith("-SNAPSHOT")) {
@@ -29,13 +30,12 @@ tasks.withType<Jar> {
         attributes["Implementation-Vendor"] = "Velocity Contributors"
         attributes["Multi-Release"] = "true"
         attributes["Specification-Version"] = velocityHumanVersion
-        attributes["Implementation-Version"] = velocityVersion
+        attributes["Implementation-Version"] = velocityVersionButWithoutTheDashSnapshot
         attributes["Brand-Id"] = "papermc:velocity"
         attributes["Brand-Name"] = "Velocity"
         attributes["Build-Number"] = (buildNumber ?: "")
         attributes["Build-Time"] = Instant.now().toString()
         attributes["Git-Branch"] = gitBranch
         attributes["Git-Commit"] = gitHash
-        attributes["Full-Version"] = implementationVersion
     }
 }
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
index b43222448e..13e1710d9b 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
@@ -37,7 +37,6 @@
 import com.velocitypowered.api.util.GameProfile;
 import com.velocitypowered.api.util.ProxyVersion;
 import com.velocitypowered.api.util.buildinfo.ServerBuildInfo;
-import com.velocitypowered.api.util.buildinfo.VelocityServerBuildInfo;
 import com.velocitypowered.proxy.command.VelocityCommandManager;
 import com.velocitypowered.proxy.command.builtin.CallbackCommand;
 import com.velocitypowered.proxy.command.builtin.GlistCommand;
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/buildinfo/ServerBuildInfoImpl.java b/proxy/src/main/java/com/velocitypowered/proxy/util/buildinfo/ServerBuildInfoImpl.java
index 9f642f6113..3f3117e971 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/util/buildinfo/ServerBuildInfoImpl.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/util/buildinfo/ServerBuildInfoImpl.java
@@ -93,11 +93,11 @@ public boolean isBrandCompatible(final @NotNull Key brandId) {
   public @NotNull String asString(final @NotNull StringRepresentation representation) {
     final StringBuilder sb = new StringBuilder();
     sb.append(this.velocityVersionName);
-    if (this.buildNumber.isPresent()) {
-      sb.append('-'); // eh
-      sb.append(this.buildNumber.getAsInt());
-    } else if (!this.velocityVersionName.contains("-SNAPSHOT")) {
-      sb.append('-'); // eh
+    sb.append('-');
+    final OptionalInt buildNumber = this.buildNumber;
+    if (buildNumber.isPresent()) {
+      sb.append(buildNumber.getAsInt());
+    } else {
       sb.append(BUILD_DEV);
     }
     final boolean hasGitBranch = this.gitBranch.isPresent();