diff --git a/version/version.go b/version/version.go
index 3312b83567..0f3e830f5b 100644
--- a/version/version.go
+++ b/version/version.go
@@ -32,6 +32,10 @@ func Get() *Info {
 	if GitDescribe == "" && rel == "" && VersionPrerelease != "" {
 		rel = "dev"
 	}
+	// Remove metadata string from version output for oss
+	if md == "oss" {
+		md = ""
+	}
 
 	return &Info{
 		CgoEnabled:        CgoEnabled,
@@ -53,7 +57,7 @@ func (c *Info) VersionNumber() string {
 		version = fmt.Sprintf("%s-%s", version, c.VersionPrerelease)
 	}
 
-	if c.VersionMetadata != "" {
+	if c.VersionMetadata != "" && c.VersionMetadata != "oss" {
 		version = fmt.Sprintf("%s+%s", version, c.VersionMetadata)
 	}
 
@@ -95,7 +99,7 @@ func FromVersionString(s string) *Info {
 		return nil
 	}
 
-	if md := v.Metadata(); len(md) > 0 {
+	if md := v.Metadata(); len(md) > 0 && md != "oss" {
 		i.VersionMetadata = md
 	}
 	if pr := v.Prerelease(); len(pr) > 0 {
@@ -118,7 +122,7 @@ func (c *Info) FullVersionNumber(rev bool) string {
 		fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease)
 	}
 
-	if c.VersionMetadata != "" {
+	if c.VersionMetadata != "" && c.VersionMetadata != "oss" {
 		fmt.Fprintf(&versionString, "+%s", c.VersionMetadata)
 	}