diff --git a/cmd/kube-vip-kubeadm.go b/cmd/kube-vip-kubeadm.go
index 21034458..d43a19be 100644
--- a/cmd/kube-vip-kubeadm.go
+++ b/cmd/kube-vip-kubeadm.go
@@ -57,10 +57,10 @@ var kubeKubeadmInit = &cobra.Command{
 		}
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
-				log.Error("generating CIDR", "err", err)
+				log.Error("generating VIPSubnet", "err", err)
 				return
 			}
 		}
@@ -102,10 +102,10 @@ var kubeKubeadmJoin = &cobra.Command{
 		}
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
-				log.Error("generating CIDR", "err", err)
+				log.Error("generating VIPSubnet", "err", err)
 				return
 			}
 		}
diff --git a/cmd/kube-vip-manifests.go b/cmd/kube-vip-manifests.go
index 7ef7dc23..dc24796c 100644
--- a/cmd/kube-vip-manifests.go
+++ b/cmd/kube-vip-manifests.go
@@ -58,8 +58,8 @@ var kubeManifestPod = &cobra.Command{
 		}
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("config parse", "err", err)
 				return
@@ -91,8 +91,8 @@ var kubeManifestDaemon = &cobra.Command{
 		}
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("config parse", "err", err)
 				return
@@ -125,10 +125,10 @@ var kubeManifestRbac = &cobra.Command{
 		}
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
-				log.Error("generating CIDR", "err", err)
+				log.Error("generating VIPSubnet", "err", err)
 				return
 			}
 		}
diff --git a/cmd/kube-vip.go b/cmd/kube-vip.go
index fc1142f2..cc1e6618 100644
--- a/cmd/kube-vip.go
+++ b/cmd/kube-vip.go
@@ -52,11 +52,10 @@ func init() {
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.Interface, "interface", "", "Name of the interface to bind to")
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.ServicesInterface, "serviceInterface", "", "Name of the interface to bind to (for services)")
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.VIP, "vip", "", "The Virtual IP address")
-	kubeVipCmd.PersistentFlags().StringVar(&initConfig.VIPSubnet, "vipSubnet", "", "The Virtual IP address subnet e.g. /32 /24 /8 etc..")
+	kubeVipCmd.PersistentFlags().StringVar(&initConfig.VIPSubnet, "vipSubnet", "", "The Virtual IP address subnet e.g. /32 /24 /8 etc.. (Default to 32 for IPv4 and 128 for IPv6)")
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.NodeName, "nodeName", "", "Name to be used for lease holder. Must be unique for each node/instance")
 
-	kubeVipCmd.PersistentFlags().StringVar(&initConfig.VIPCIDR, "cidr", "", "The CIDR range for the virtual IP address. Default to 32 for IPv4 and 128 for IPv6") // todo: deprecate
-
+	// VIP flags
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.Address, "address", "", "an address (IP or DNS name) to use as a VIP")
 	kubeVipCmd.PersistentFlags().Uint16Var(&initConfig.Port, "port", 6443, "Port for the VIP")
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableARP, "arp", false, "Enable Arp for VIP changes")
@@ -203,8 +202,8 @@ var kubeVipService = &cobra.Command{
 		}
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("generating CIDR", "err", err)
 				return
@@ -242,8 +241,8 @@ var kubeVipManager = &cobra.Command{
 		log.SetLogLoggerLevel(log.Level(initConfig.Logging))
 
 		// Ensure there is an address to generate the CIDR from
-		if initConfig.VIPCIDR == "" && initConfig.Address != "" {
-			initConfig.VIPCIDR, err = GenerateCidrRange(initConfig.Address)
+		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("No interface is specified for kube-vip to bind to")
 				return
@@ -287,12 +286,12 @@ var kubeVipManager = &cobra.Command{
 			return
 		}
 
-		if !initConfig.EnableARP && strings.Contains(initConfig.VIPCIDR, kubevip.Auto) {
+		if !initConfig.EnableARP && strings.Contains(initConfig.VIPSubnet, kubevip.Auto) {
 			log.Error("auto subnet discovery cannot be used outside ARP mode")
 			return
 		}
 
-		if strings.Contains(initConfig.VIPCIDR, kubevip.Auto) && initConfig.Address != "" {
+		if strings.Contains(initConfig.VIPSubnet, kubevip.Auto) && initConfig.Address != "" {
 			log.Error("auto subnet discovery cannot be used if VIP address was provided")
 			return
 		}
diff --git a/pkg/kubevip/config_environment.go b/pkg/kubevip/config_environment.go
index 4a8faa2b..6b9e40b9 100644
--- a/pkg/kubevip/config_environment.go
+++ b/pkg/kubevip/config_environment.go
@@ -232,12 +232,6 @@ func ParseEnvironment(c *Config) error {
 		}
 	}
 
-	// Find vip address cidr range
-	env = os.Getenv(vipCidr)
-	if env != "" {
-		c.VIPCIDR = env
-	}
-
 	// Find vip address subnet
 	env = os.Getenv(vipSubnet)
 	if env != "" {
diff --git a/pkg/kubevip/config_envvar.go b/pkg/kubevip/config_envvar.go
index ae16f174..e2a1dce1 100644
--- a/pkg/kubevip/config_envvar.go
+++ b/pkg/kubevip/config_envvar.go
@@ -39,9 +39,6 @@ const (
 	// vipServicesInterface - defines the interface that the service vips should bind too
 	vipServicesInterface = "vip_servicesinterface"
 
-	// vipCidr - defines the cidr that the vip will use (for BGP)
-	vipCidr = "vip_cidr"
-
 	// vipSubnet - defines the subnet that the vip will use
 	vipSubnet = "vip_subnet"
 
diff --git a/pkg/kubevip/config_generator.go b/pkg/kubevip/config_generator.go
index ff68f568..0aaa221b 100644
--- a/pkg/kubevip/config_generator.go
+++ b/pkg/kubevip/config_generator.go
@@ -228,18 +228,6 @@ func generatePodSpec(c *Config, imageVersion string, inCluster bool) *corev1.Pod
 		newEnvironment = append(newEnvironment, svcInterface...)
 	}
 
-	// If a CIDR is used add it to the manifest
-	if c.VIPCIDR != "" {
-		// build environment variables
-		cidr := []corev1.EnvVar{
-			{
-				Name:  vipCidr,
-				Value: c.VIPCIDR,
-			},
-		}
-		newEnvironment = append(newEnvironment, cidr...)
-	}
-
 	// If a subnet is required for the VIP
 	if c.VIPSubnet != "" {
 		// build environment variables
diff --git a/pkg/kubevip/config_types.go b/pkg/kubevip/config_types.go
index faafd4bf..293fa60c 100644
--- a/pkg/kubevip/config_types.go
+++ b/pkg/kubevip/config_types.go
@@ -76,9 +76,6 @@ type Config struct {
 	// VipSubnet is the Subnet that is applied to the VIP
 	VIPSubnet string `yaml:"vipSubnet"`
 
-	// VIPCIDR is cidr range for the VIP (primarily needed for BGP)
-	VIPCIDR string `yaml:"vipCidr"`
-
 	// Address is the IP or DNS Name to use as a VirtualIP
 	Address string `yaml:"address"`