diff --git a/gui/vite.config.ts b/gui/vite.config.ts
index f123b9a455..502d59efaf 100644
--- a/gui/vite.config.ts
+++ b/gui/vite.config.ts
@@ -1,11 +1,14 @@
 import react from '@vitejs/plugin-react';
 import { defineConfig, PluginOption } from 'vite';
 import { execSync } from 'child_process';
-import path from 'path'
+import path from 'path';
 import { visualizer } from 'rollup-plugin-visualizer';
 
 const commitHash = execSync('git rev-parse --verify --short HEAD').toString().trim();
-const versionTag = execSync('git --no-pager tag --points-at HEAD').toString().trim();
+const versionTag = execSync('git --no-pager tag --sort -taggerdate --points-at HEAD')
+  .toString()
+  .split('\n')[0]
+  .trim();
 // If not empty then it's not clean
 const gitClean = execSync('git status --porcelain').toString() ? false : true;
 
@@ -51,7 +54,7 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, 'src')
-    }
-  }
+      '@': path.resolve(__dirname, 'src'),
+    },
+  },
 });
diff --git a/server/desktop/build.gradle.kts b/server/desktop/build.gradle.kts
index f3d565bdbb..9966ced901 100644
--- a/server/desktop/build.gradle.kts
+++ b/server/desktop/build.gradle.kts
@@ -81,8 +81,8 @@ buildConfig {
 	packageName("dev.slimevr.desktop")
 
 	val gitVersionTag = providers.exec {
-		commandLine("git", "--no-pager", "tag", "--points-at", "HEAD")
-	}.standardOutput.asText.get()
+		commandLine("git", "--no-pager", "tag", "--sort", "-taggerdate", "--points-at", "HEAD")
+	}.standardOutput.asText.get().split('\n').first()
 	buildConfigField("String", "GIT_COMMIT_HASH", "\"${grgit.head().abbreviatedId}\"")
 	buildConfigField("String", "GIT_VERSION_TAG", "\"${gitVersionTag.trim()}\"")
 	buildConfigField("boolean", "GIT_CLEAN", grgit.status().isClean.toString())