diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml
index c8968cb056..938240ab1e 100644
--- a/.github/workflows/nfr.yml
+++ b/.github/workflows/nfr.yml
@@ -144,6 +144,10 @@ jobs:
         working-directory: ./tests
         run: make create-and-setup-vm
 
+      - name: Create and setup Router
+        working-directory: ./tests
+        run: make create-gke-router || true
+
       - name: Run Tests
         working-directory: ./tests
         run: |
@@ -164,6 +168,7 @@ jobs:
         if: always()
         run: |
           bash scripts/cleanup-vm.sh true
+          bash scripts/cleanup-router.sh true
           make delete-gke-cluster
           rm -rf scripts/vars.env