diff --git a/.github/workflows/build-cpp-runtime-bindings.yml b/.github/workflows/build-cpp-runtime-bindings.yml
index 4e9b4712..43a0a36d 100644
--- a/.github/workflows/build-cpp-runtime-bindings.yml
+++ b/.github/workflows/build-cpp-runtime-bindings.yml
@@ -62,7 +62,13 @@ jobs:
 
   test:
     needs: build-cpp-runtime-bindings
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        runner:
+          - ubuntu-22.04      # Intel hardware (self-hosted)
+          - ubuntu-latest     # AMD hardware (GitHub-hosted)
+      fail-fast: false
 
     steps:
       - uses: actions/checkout@v5
diff --git a/docker/x86_64/test-cpp-runtime-bindings.sh b/docker/x86_64/test-cpp-runtime-bindings.sh
index b075c620..dad07e38 100644
--- a/docker/x86_64/test-cpp-runtime-bindings.sh
+++ b/docker/x86_64/test-cpp-runtime-bindings.sh
@@ -21,6 +21,9 @@ source /etc/bashrc || true
 # chmod +x docker/x86_64/list-dependencies.sh
 # ./docker/x86_64/list-dependencies.sh
 
+# temp: add lscpu to see if indeed intel and AMD
+lscpu
+
 # FAISS validation scope for now
 # Create conda env matching https://github.com/facebookresearch/faiss/blob/main/.github/actions/build_cmake/action.yml
 conda create -y -n svsenv python=3.11