diff --git a/pkg/types/toolname.go b/pkg/types/toolname.go
index 8f46dd19..e1e44a55 100644
--- a/pkg/types/toolname.go
+++ b/pkg/types/toolname.go
@@ -26,6 +26,10 @@ func ToolNormalizer(tool string) string {
 	}
 
 	name := invalidChars.ReplaceAllString(tool, "_")
+	for strings.HasSuffix(name, "_") {
+		name = strings.TrimSuffix(name, "_")
+	}
+
 	if len(name) > 55 {
 		name = name[:55]
 	}