diff --git a/.github/workflows/kind.yaml b/.github/workflows/kind.yaml
index 5735eaba28..e5fe828d8b 100644
--- a/.github/workflows/kind.yaml
+++ b/.github/workflows/kind.yaml
@@ -82,9 +82,9 @@ jobs:
 
       - name: Relay Port Forward
         run: |
-          pkill -f "kubectl port-forward.*hubble-relay" || true
+          pkill -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay"
           sleep 1s
-          kubectl port-forward -n kube-system deployment/hubble-relay 4245:4245&
+          cilium hubble port-forward&
           sleep 5s
 
       - name: Connectivity test
diff --git a/README.md b/README.md
index 30f178f78a..e72dd86e1f 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ To install Cilium while automatically detected:
 
 ### Hubble
 
-    ./cilium hubble enable
+    cilium hubble enable
     🔑 Generating certificates for Relay...
     2021/01/06 14:40:21 [INFO] generate received request
     2021/01/06 14:40:21 [INFO] received CSR
@@ -132,7 +132,7 @@ To install Cilium while automatically detected:
 
 #### With Flow Validation
 
-    kubectl port-forward -n kube-system deployment/hubble-relay 4245:4245&
+    cilium hubble port-forward&
     cilium connectivity test --single-node
     ⌛ Waiting for deployments to become ready
     🔭 Enabling Hubble telescope...
diff --git a/connectivity/check/context.go b/connectivity/check/context.go
index dc557fa9d0..f5daf53452 100644
--- a/connectivity/check/context.go
+++ b/connectivity/check/context.go
@@ -330,7 +330,10 @@ func (ct *ConnectivityTest) enableHubbleClient(ctx context.Context) error {
 	status, err := ct.hubbleClient.ServerStatus(ctx, &observer.ServerStatusRequest{})
 	if err != nil {
 		ct.Warn("Unable to contact Hubble Relay, disabling Hubble telescope and flow validation:", err)
-		ct.Info("Expose Relay locally with: kubectl port-forward -n kube-system deployment/hubble-relay 4245:4245")
+		ct.Info(`Expose Relay locally with:
+   cilium hubble enable
+   cilium status --wait
+   cilium hubble port-forward&`)
 		ct.hubbleClient = nil
 		ct.params.Hubble = false