diff --git a/cli/cmd/tap.go b/cli/cmd/tap.go
index 8f2dd5c5c..d765dbdbc 100644
--- a/cli/cmd/tap.go
+++ b/cli/cmd/tap.go
@@ -92,10 +92,6 @@ Supported protocols are HTTP and gRPC.`,
 func init() {
 	rootCmd.AddCommand(tapCmd)
 
-	mizuVersion := mizu.Version(mizu.SemVer)
-	majorVersion := mizuVersion.Major()
-	minorVersion := mizuVersion.Minor()
-
 	tapCmd.Flags().Uint16VarP(&mizuTapOptions.GuiPort, "gui-port", "p", 8899, "Provide a custom port for the web interface webserver")
 	tapCmd.Flags().StringVarP(&mizuTapOptions.Namespace, "namespace", "n", "", "Namespace selector")
 	tapCmd.Flags().BoolVar(&mizuTapOptions.Analysis, "analysis", false, "Uploads traffic to UP9 for further analysis (Beta)")
@@ -103,7 +99,7 @@ func init() {
 	tapCmd.Flags().Uint16VarP(&mizuTapOptions.SleepIntervalSec, "upload-interval", "", 10, "Interval in seconds for uploading data to UP9")
 	tapCmd.Flags().BoolVarP(&mizuTapOptions.AllNamespaces, "all-namespaces", "A", false, "Tap all namespaces")
 	tapCmd.Flags().StringVarP(&mizuTapOptions.KubeConfigPath, "kube-config", "k", "", "Path to kube-config file")
-	tapCmd.Flags().StringVarP(&mizuTapOptions.MizuImage, "mizu-image", "", fmt.Sprintf("gcr.io/up9-docker-hub/mizu/main:%s.%s", majorVersion, minorVersion), "Custom image for mizu collector")
+	tapCmd.Flags().StringVarP(&mizuTapOptions.MizuImage, "mizu-image", "", fmt.Sprintf("gcr.io/up9-docker-hub/mizu/%s:%s", mizu.Branch, mizu.SemVer), "Custom image for mizu collector")
 	tapCmd.Flags().StringArrayVarP(&mizuTapOptions.PlainTextFilterRegexes, "regex-masking", "r", nil, "List of regex expressions that are used to filter matching values from text/plain http bodies")
 	tapCmd.Flags().StringVarP(&direction, "direction", "", "in", "Record traffic that goes in this direction (relative to the tapped pod): in/any")
 	tapCmd.Flags().BoolVar(&mizuTapOptions.HideHealthChecks, "hide-healthchecks", false, "hides requests with kube-probe or prometheus user-agent headers")
diff --git a/cli/mizu/version.go b/shared/semver/semver.go
similarity index 58%
rename from cli/mizu/version.go
rename to shared/semver/semver.go
index 67f818501..f27ca33f0 100644
--- a/cli/mizu/version.go
+++ b/shared/semver/semver.go
@@ -1,28 +1,28 @@
-package mizu
+package semver
 
 import (
 	"regexp"
 )
 
-type Version string
+type SemVersion string
 
-func (v Version) Breakdown() (string, string, string) {
+func (v SemVersion) Breakdown() (string, string, string) {
 	re := regexp.MustCompile(`\d+`)
 	breakdown := re.FindAllString(string(v), 3)
 	return breakdown[0], breakdown[1], breakdown[2]
 }
 
-func (v Version) Major() string {
+func (v SemVersion) Major() string {
 	major, _, _ := v.Breakdown()
 	return major
 }
 
-func (v Version) Minor() string {
+func (v SemVersion) Minor() string {
 	_, minor, _ := v.Breakdown()
 	return minor
 }
 
-func (v Version) Patch() string {
+func (v SemVersion) Patch() string {
 	_, _, patch := v.Breakdown()
 	return patch
 }