diff --git a/.github/workflows/eks-tunnel.yaml b/.github/workflows/eks-tunnel.yaml
index a505625983..0be0f60bee 100644
--- a/.github/workflows/eks-tunnel.yaml
+++ b/.github/workflows/eks-tunnel.yaml
@@ -14,9 +14,9 @@ on:
   #   will disappear from the PR checks: please provide a direct link to the
   #   successful workflow run (can be found from Actions tab) in a comment.
   #
-  # pull_request: {}
+  pull_request: {}
   ###
-  pull_request_target: {}
+  #pull_request_target: {}
   # Run every 6 hours
   schedule:
     - cron:  '30 1/6 * * *'
@@ -158,11 +158,7 @@ jobs:
           # Port forward Relay
           cilium hubble port-forward&
           sleep 10s
-          if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
-            # support for native port-forwarding
-            # TODO: remove kubectl version after 0.16.20 release
-            [[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
-          fi
+          [[ $(pgrep -f "^cilium hubble port-forward$" | wc -l) == 1 ]]
 
           # Run connectivity test
           cilium connectivity test --test-concurrency=3 --all-flows --collect-sysdump-on-failure --external-target amazon.com. \
diff --git a/.github/workflows/eks.yaml b/.github/workflows/eks.yaml
index eaffeb7670..397c18967a 100644
--- a/.github/workflows/eks.yaml
+++ b/.github/workflows/eks.yaml
@@ -14,9 +14,9 @@ on:
   #   will disappear from the PR checks: please provide a direct link to the
   #   successful workflow run (can be found from Actions tab) in a comment.
   #
-  # pull_request: {}
+  pull_request: {}
   ###
-  pull_request_target: {}
+  #pull_request_target: {}
   # Run every 6 hours
   schedule:
     - cron:  '0 1/6 * * *'
@@ -157,11 +157,7 @@ jobs:
           # Port forward Relay
           cilium hubble port-forward&
           sleep 10s
-          if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
-            # support for native port-forwarding
-            # TODO: remove kubectl version after 0.16.20 release
-            [[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
-          fi
+          [[ $(pgrep -f "^cilium hubble port-forward$" | wc -l) == 1 ]]
 
           # Run connectivity test
           cilium connectivity test --test-concurrency=3 --all-flows --collect-sysdump-on-failure --external-target amazon.com.
diff --git a/.github/workflows/gke.yaml b/.github/workflows/gke.yaml
index 437f9a9837..b243186865 100644
--- a/.github/workflows/gke.yaml
+++ b/.github/workflows/gke.yaml
@@ -14,9 +14,9 @@ on:
   #   will disappear from the PR checks: please provide a direct link to the
   #   successful workflow run (can be found from Actions tab) in a comment.
   #
-  # pull_request: {}
+  pull_request: {}
   ###
-  pull_request_target: {}
+  # pull_request_target: {}
   # Run every 6 hours
   schedule:
     - cron:  '0 2/6 * * *'
@@ -153,11 +153,8 @@ jobs:
           # Port forward Relay
           cilium hubble port-forward&
           sleep 10s
-          if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
-            # support for native port-forwarding
-            # TODO: remove kubectl version after 0.16.20 release
-            [[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
-          fi
+
+          [[ $(pgrep -f "^cilium hubble port-forward$" | wc -l) == 1 ]]
 
           # Run connectivity test
           cilium connectivity test --test-concurrency=5 --all-flows --collect-sysdump-on-failure --external-target google.com.
diff --git a/.github/workflows/kind.yaml b/.github/workflows/kind.yaml
index be0f54b57d..82d6d1de49 100644
--- a/.github/workflows/kind.yaml
+++ b/.github/workflows/kind.yaml
@@ -82,11 +82,7 @@ jobs:
         run: |
           cilium hubble port-forward&
           sleep 10s
-          if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
-            # support for native port-forwarding
-            # TODO: remove kubectl version after 0.16.20 release
-            [[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
-          fi
+          [[ $(pgrep -f "^cilium hubble port-forward$" | wc -l) == 1 ]]
 
       - name: Set up external targets
         id: external_targets
@@ -164,11 +160,7 @@ jobs:
         run: |
           cilium hubble port-forward&
           sleep 10s
-          if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
-            # support for native port-forwarding
-            # TODO: remove kubectl version after 0.16.20 release
-            [[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
-          fi
+          [[ $(pgrep -f "^cilium hubble port-forward$" | wc -l) == 1 ]]
 
       - name: Connectivity test
         run: |
diff --git a/.github/workflows/multicluster.yaml b/.github/workflows/multicluster.yaml
index 9ba005c7a4..dcbb83b7c3 100644
--- a/.github/workflows/multicluster.yaml
+++ b/.github/workflows/multicluster.yaml
@@ -14,9 +14,9 @@ on:
   #   will disappear from the PR checks: please provide a direct link to the
   #   successful workflow run (can be found from Actions tab) in a comment.
   #
-  # pull_request: {}
+  pull_request: {}
   ###
-  pull_request_target: {}
+  # pull_request_target: {}
   # Run every 6 hours
   schedule:
     - cron:  '0 3/6 * * *'
@@ -250,11 +250,7 @@ jobs:
           # Port forward Relay
           cilium --context "${{ steps.contexts.outputs.cluster1 }}" hubble port-forward&
           sleep 10s
-          if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
-            # support for native port-forwarding
-            # TODO: remove kubectl version after 0.16.20 release
-            [[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
-          fi
+          [[ $(pgrep -f "^cilium hubble port-forward$" | wc -l) == 1 ]]
 
           # Run connectivity test
           cilium --context "${{ steps.contexts.outputs.cluster1 }}" connectivity test --test-concurrency=5 \