diff --git a/.github/workflows/multichain-e2e-template.yml b/.github/workflows/multichain-e2e-template.yml
index 5c7e73357184..ff6b5fd1a971 100644
--- a/.github/workflows/multichain-e2e-template.yml
+++ b/.github/workflows/multichain-e2e-template.yml
@@ -56,20 +56,17 @@ jobs:
           timeout: 30m
           namespace: agoric-multichain-${{ inputs.relayer-type }}
 
-      - name: Port forward
-        run: |
-          kubectl version
-          ./agoric-sdk/multichain-testing/scripts/port-forward.sh --config=$VALUES_FILE --namespace=$NAMESPACE
-        shell: bash
-        env:
-          VALUES_FILE: ./agoric-sdk/multichain-testing/${{ inputs.config }}
-          NAMESPACE: agoric-multichain-${{ inputs.relayer-type }}
-
-      - name: Fund Provision Pool
+      - name: Set kubectl context
         run: |
           kubectl config set-context --current --namespace=agoric-multichain-${{ inputs.relayer-type }}
           kubectl get pods
-          make fund-provision-pool
+        working-directory: ./agoric-sdk/multichain-testing
+
+      - name: Port forward
+        run: make port-forward FILE=${{ inputs.config }}
+
+      - name: Fund Provision Pool
+        run: make fund-provision-pool
         working-directory: ./agoric-sdk/multichain-testing
 
       - name: Ensure ports are forwarded