diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go
index a4c5f3040893..40d612e2cec5 100644
--- a/pkg/minikube/bootstrapper/images/images.go
+++ b/pkg/minikube/bootstrapper/images/images.go
@@ -185,7 +185,7 @@ func KindNet(repo string) string {
 }
 
 // all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml
-const calicoVersion = "v3.30.1"
+const calicoVersion = "v3.30.2"
 const calicoRepo = "docker.io/calico"
 
 // CalicoDaemonSet returns the image used for calicoDaemonSet
diff --git a/pkg/minikube/cni/calico.yaml b/pkg/minikube/cni/calico.yaml
index fa70e49a2c14..dcec8f6d22e4 100644
--- a/pkg/minikube/cni/calico.yaml
+++ b/pkg/minikube/cni/calico.yaml
@@ -525,6 +525,8 @@ spec:
                   Option to keep the original nexthop field when routes are sent to a BGP Peer.
                   Setting "true" configures the selected BGP Peers node to use the "next hop keep;"
                   instead of "next hop self;"(default) in the specific branch of the Node on "bird.cfg".
+                  Note: that this field is deprecated. Users should use the NextHopMode field to control
+                  the next hop attribute for a BGP peer.
                 type: boolean
               localWorkloadSelector:
                 description: |-
@@ -536,6 +538,26 @@ spec:
                   Time to allow for software restart.  When specified, this is configured as the graceful
                   restart timeout.  When not specified, the BIRD default of 120s is used.
                 type: string
+              nextHopMode:
+                allOf:
+                - enum:
+                  - Auto
+                  - Self
+                  - Keep
+                - enum:
+                  - Auto
+                  - Self
+                  - Keep
+                description: |-
+                  NextHopMode defines the method of calculating the next hop attribute for received routes.
+                  This replaces and expands the deprecated KeepOriginalNextHop field.
+                  Users should use this setting to control the next hop attribute for a BGP peer.
+                  When this is set, the value of the KeepOriginalNextHop field is ignored.
+                  if neither keepOriginalNextHop or nextHopMode is specified, BGP's default behaviour is used.
+                  Set it to “Auto” to apply BGP’s default behaviour.
+                  Set it to "Self" to configure "next hop self;" in "bird.cfg".
+                  Set it to "Keep" to configure "next hop keep;" in "bird.cfg".
+                type: string
               node:
                 description: |-
                   The node name identifying the Calico node instance that is targeted by this peer.