diff --git a/build/print-workspace-status.py b/build/print-workspace-status.py
index af62079..2838730 100755
--- a/build/print-workspace-status.py
+++ b/build/print-workspace-status.py
@@ -47,7 +47,7 @@
 
 # Git tags pointing at this commit.
 git_tags_b: [bytes] = subprocess.check_output(
-    ["git", "tag", "--points-at", "HEAD"]
+    ["git", "tag", "--sort=-version:refname", "--points-at", "HEAD"]
 ).split(b"\n")
 git_tags: [str] = [t.decode().strip() for t in git_tags_b if t.decode().strip() != ""]
 
@@ -95,19 +95,12 @@
 
 
 for product in ["metropolis", "cloud"]:
-    versions = []
-    # Get exact versions from tags.
+    # Get exact version from tags.
+    version = None
     for tag in git_tags:
         version = parse_tag(tag, product)
-        if version is None:
-            continue
-        versions.append(version)
-    version = None
-    if len(versions) > 0:
-        # Find the highest version and use that. Lexicographic sort is good enough
-        # for the limited subset of semver we support.
-        versions.sort(reverse=True)
-        version = versions[0]
+        if version is not None:
+            break
 
     if version is None:
         # No exact version found. Use latest tag for the given product and
@@ -115,7 +108,7 @@
         # tag.
         for tag in (
             subprocess.check_output(
-                ["git", "tag", "--sort=-refname", "--merged", "HEAD"]
+                ["git", "tag", "--sort=-version:refname", "--merged", "HEAD"]
             )
             .decode()
             .strip()