diff --git a/deployments/emojivoto/portforwarder.yml b/deployments/emojivoto/portforwarder.yml
index 46fa82a60e..509af7d5b1 100644
--- a/deployments/emojivoto/portforwarder.yml
+++ b/deployments/emojivoto/portforwarder.yml
@@ -3,6 +3,8 @@ kind: Pod
 metadata:
   name: port-forwarder-coordinator
   namespace: edg-default
+  labels:
+    app.kubernetes.io/name: port-forwarder-coordinator
 spec:
   containers:
     - name: port-forwarder
@@ -31,6 +33,8 @@ kind: Pod
 metadata:
   name: port-forwarder-emojivoto-web
   namespace: edg-default
+  labels:
+    app.kubernetes.io/name: port-forwarder-emojivoto-web
 spec:
   containers:
     - name: port-forwarder
diff --git a/deployments/openssl/portforwarder.yml b/deployments/openssl/portforwarder.yml
index ed7b4ee442..34ccecab99 100644
--- a/deployments/openssl/portforwarder.yml
+++ b/deployments/openssl/portforwarder.yml
@@ -3,6 +3,8 @@ kind: Pod
 metadata:
   name: port-forwarder-coordinator
   namespace: edg-default
+  labels:
+    app.kubernetes.io/name: port-forwarder-coordinator
 spec:
   containers:
     - name: port-forwarder
diff --git a/deployments/simple/portforwarder.yml b/deployments/simple/portforwarder.yml
index ed7b4ee442..34ccecab99 100644
--- a/deployments/simple/portforwarder.yml
+++ b/deployments/simple/portforwarder.yml
@@ -3,6 +3,8 @@ kind: Pod
 metadata:
   name: port-forwarder-coordinator
   namespace: edg-default
+  labels:
+    app.kubernetes.io/name: port-forwarder-coordinator
 spec:
   containers:
     - name: port-forwarder
diff --git a/justfile b/justfile
index 8408eaa7d7..316c6fdf3a 100644
--- a/justfile
+++ b/justfile
@@ -70,6 +70,7 @@ set:
     set -euo pipefail
     ns=$(cat ./{{ workspace_dir }}/just.namespace)
     nix run .#kubectl-wait-ready -- $ns coordinator
+    nix run .#kubectl-wait-ready -- $ns port-forwarder-coordinator
     kubectl -n $ns port-forward pod/port-forwarder-coordinator 1313 &
     PID=$!
     trap "kill $PID" EXIT