diff --git a/common/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
similarity index 78%
rename from common/src/main/resources/plugin.yml
rename to bukkit/src/main/resources/plugin.yml
index e7b812b3..8fa51720 100644
--- a/common/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: HuskSync
-version: '@version@'
+version: ${version}
 main: me.william278.husksync.HuskSyncBukkit
 api-version: 1.16
 author: William278
diff --git a/common/src/main/resources/bungee.yml b/bungeecord/src/main/resources/bungee.yml
similarity index 83%
rename from common/src/main/resources/bungee.yml
rename to bungeecord/src/main/resources/bungee.yml
index 22caef2a..3076d001 100644
--- a/common/src/main/resources/bungee.yml
+++ b/bungeecord/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
 name: HuskSync
-version: '@version@'
+version: ${version}
 main: me.william278.husksync.HuskSyncBungeeCord
 author: William278
 description: 'A modern, cross-server player data synchronization system'
\ No newline at end of file
diff --git a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java b/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java
index 3be46372..5ba19987 100644
--- a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java
+++ b/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java
@@ -7,6 +7,7 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.Plugin;
+import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import me.william278.husksync.migrator.MPDBMigrator;
@@ -31,20 +32,11 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.logging.Level;
 
-import static me.william278.husksync.HuskSyncVelocity.VERSION;
-
-@Plugin(
-        id = "husksync",
-        name = "HuskSync",
-        version = VERSION,
-        description = "A modern, cross-server player data synchronization system",
-        authors = {"William278"},
-        url = "https://william278.net"
-)
+@Plugin(id = "husksync")
 public class HuskSyncVelocity {
 
     // Plugin version
-    public static final String VERSION = "1.3.2";
+    public static String VERSION = null;
 
     // Velocity bStats ID (different from Bukkit and BungeeCord)
     private static final int METRICS_ID = 13489;
@@ -95,11 +87,13 @@ public class HuskSyncVelocity {
     }
 
     @Inject
-    public HuskSyncVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory) {
+    public HuskSyncVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory, PluginContainer pluginContainer) {
         this.server = server;
         this.logger = logger;
         this.dataDirectory = dataDirectory;
         this.metricsFactory = metricsFactory;
+
+        pluginContainer.getDescription().getVersion().ifPresent(s -> VERSION = s);
     }
 
     @Subscribe
diff --git a/velocity/src/main/resources/velocity-plugin.json b/velocity/src/main/resources/velocity-plugin.json
new file mode 100644
index 00000000..2f9d0417
--- /dev/null
+++ b/velocity/src/main/resources/velocity-plugin.json
@@ -0,0 +1,12 @@
+{
+  "id": "husksync",
+  "name": "HuskSync",
+  "version": "${version}",
+  "description": "A modern, cross-server player data synchronization system",
+  "url": "https://william278.net",
+  "authors": [
+    "William278"
+  ],
+  "dependencies": [],
+  "main": "me.william278.husksync.HuskSyncVelocity"
+}
\ No newline at end of file