diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
index 09b6031de..425a04f41 100644
--- a/.github/workflows/nightly-tests.yml
+++ b/.github/workflows/nightly-tests.yml
@@ -8,7 +8,13 @@ permissions:
   contents: read
 jobs:
   run-nightly-tests:
-    runs-on: [self-hosted, linux, x64, dpdk]
+    strategy:
+      matrix:
+        nic:
+          - e810
+          - e830
+      fail-fast: false
+    runs-on: ${{ matrix.nic }}
     timeout-minutes: 720
     steps:
       - name: 'preparation: Harden Runner'
@@ -34,6 +40,15 @@ jobs:
           sed -i "s/SSH_PORT_PLACEHOLDER/${{ secrets.BARE_METAL_SSH_PORT }}/" tests/validation/configs/topology_config.yaml
           sed -i "s/USERNAME_PLACEHOLDER/${{ secrets.BARE_METAL_USERNAME }}/" tests/validation/configs/topology_config.yaml
           sed -i "s+KEY_PATH_PLACEHOLDER+${{ secrets.BARE_METAL_SSH_KEY_PATH }}+" tests/validation/configs/topology_config.yaml
+
+      - name: Set pci_device parameter to E810 PCI ID in topology config
+        if: ${{ matrix.nic == 'e810' }}
+        run: sed -i "s/PCI_DEVICE_PLACEHOLDER/8086:1592/" tests/validation/configs/topology_config.yaml
+
+      - name: Set pci_device parameter to E830 PCI ID in topology config
+        if: ${{ matrix.nic == 'e830' }}
+        run: sed -i "s/PCI_DEVICE_PLACEHOLDER/8086:12d2/" tests/validation/configs/topology_config.yaml
+
       - name: 'preparation: Evaluate chosen validation-test-port-p and validation-test-port-r'
         run: |
           eval "export TEST_PORT_P=TEST_VF_PORT_P_0"
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index ebc9ccf9e..434d950bb 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -13,7 +13,13 @@ permissions:
   contents: read
 jobs:
   run-smoke-tests:
-    runs-on: [self-hosted, linux, x64, dpdk]
+    strategy:
+      matrix:
+        nic:
+          - e810
+          - e830
+      fail-fast: false
+    runs-on: ${{ matrix.nic }}
     timeout-minutes: 720
     steps:
       - name: 'preparation: Harden Runner'
@@ -39,6 +45,15 @@ jobs:
           sed -i "s/SSH_PORT_PLACEHOLDER/${{ secrets.BARE_METAL_SSH_PORT }}/" tests/validation/configs/topology_config.yaml
           sed -i "s/USERNAME_PLACEHOLDER/${{ secrets.BARE_METAL_USERNAME }}/" tests/validation/configs/topology_config.yaml
           sed -i "s+KEY_PATH_PLACEHOLDER+${{ secrets.BARE_METAL_SSH_KEY_PATH }}+" tests/validation/configs/topology_config.yaml
+
+      - name: Set pci_device parameter to E810 PCI ID in topology config
+        if: ${{ matrix.nic == 'e810' }}
+        run: sed -i "s/PCI_DEVICE_PLACEHOLDER/8086:1592/" tests/validation/configs/topology_config.yaml
+
+      - name: Set pci_device parameter to E830 PCI ID in topology config
+        if: ${{ matrix.nic == 'e830' }}
+        run: sed -i "s/PCI_DEVICE_PLACEHOLDER/8086:12d2/" tests/validation/configs/topology_config.yaml
+
       - name: 'preparation: Evaluate choosen validation-test-port-p and validation-test-port-r'
         run: |
           eval "export TEST_PORT_P=TEST_VF_PORT_P_0"
diff --git a/tests/validation/configs/topology_config.yaml b/tests/validation/configs/topology_config.yaml
index 602412938..ba1776dce 100644
--- a/tests/validation/configs/topology_config.yaml
+++ b/tests/validation/configs/topology_config.yaml
@@ -6,7 +6,7 @@ hosts:
     instantiate: true
     role: sut
     network_interfaces:
-      - pci_device: 8086:1592
+      - pci_device: PCI_DEVICE_PLACEHOLDER
         interface_index: 0 # all
     connections:
       - ip_address: IP_ADDRESS_PLACEHOLDER