diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml
index 9c72df54b8..b4f9a08f43 100644
--- a/.github/workflows/interop.yml
+++ b/.github/workflows/interop.yml
@@ -20,8 +20,10 @@ jobs:
     strategy:
       matrix:
         test-type: 
-          - transport-interop
-          - hole-punching-interop
+          - folder: transport-interop
+            action: run-transport-interop-test
+          - folder: hole-punching-interop
+            action: run-interop-hole-punch-test
     
     steps:
       - name: Checkout Code
@@ -32,10 +34,10 @@ jobs:
 
       - name: Build Docker Image
         run: |
-          docker buildx build --load -t nim-libp2p-head -f tests/${{ matrix.test-type }}/Dockerfile .
+          docker buildx build --load -t nim-libp2p-head -f tests/${{ matrix.test-type.folder }}/Dockerfile .
 
       - name: Run Tests
-        uses: libp2p/test-plans/.github/actions/run-${{ matrix.test-type == 'transport-interop' && 'transport-interop-test' || 'interop-hole-punch-test' }}@master
+        uses: libp2p/test-plans/.github/actions/${{ matrix.test-type.action }}@master
         with:
           test-filter: nim-libp2p-head
           extra-versions: ${{ github.workspace }}/tests/${{ matrix.test-type }}/version.json