diff --git a/tools/build-version.go b/tools/build-version.go
index 33f23a1b..8aaffa3d 100644
--- a/tools/build-version.go
+++ b/tools/build-version.go
@@ -53,7 +53,7 @@ func main() {
 	}
 
 	// If we don't have any tag assume "dev"
-	if tag == "" {
+	if tag == "" || strings.HasPrefix(tag, "nightly") {
 		tag = "dev"
 	}
 	// Get the most likely next version: