diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 537e9e9ca..ee32288f8 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -26,7 +26,7 @@ env:
 
 jobs:
   test:
-    name: "${{ inputs.platform }} / ${{ inputs.test-name }}"
+    name: "${{ inputs.test-name }}"
     runs-on: ${{ inputs.runner }}
     permissions:
       contents: read
diff --git a/.github/workflows/e2e_manual.yaml b/.github/workflows/e2e_manual.yaml
index c9265ee42..1bacc4e86 100644
--- a/.github/workflows/e2e_manual.yaml
+++ b/.github/workflows/e2e_manual.yaml
@@ -1,4 +1,4 @@
-name: e2e test manual
+name: e2e test
 
 on:
   workflow_call:
@@ -43,16 +43,17 @@ on:
 
 jobs:
   determine-platform-params:
+    runs-on: ubuntu-22.04
     outputs:
       runner: ${{ steps.determine-platform-params.outputs.runner }}
-      self-hosted: ${{ steps.determine-platform-params.outputs.self-hosted == "true" }}
+      self-hosted: ${{ steps.determine-platform-params.outputs.self-hosted }}
     steps:
       - name: Determine Platform Parameters
         id: determine-platform-params
         run: |
           case ${{ inputs.platform }} in
             "AKS-CLH-SNP")
-              echo "runner=ubuntu:20.04" >> "$GITHUB_OUTPUT"
+              echo "runner=ubuntu-22.04" >> "$GITHUB_OUTPUT"
               echo "self-hosted=false" >> "$GITHUB_OUTPUT"
             ;;
             "K3s-QEMU-SNP")
@@ -70,7 +71,7 @@ jobs:
           esac
 
   test:
-    name: "${{ inputs.platform }} / ${{ inputs.test-name }}"
+    name: "${{ inputs.platform }}"
     needs: [determine-platform-params]
     uses: ./.github/workflows/e2e.yaml
     with:
@@ -78,7 +79,7 @@ jobs:
       test-name: ${{ inputs.test-name }}
       platform: ${{ inputs.platform }}
       runner: ${{ needs.determine-platform-params.outputs.runner }}
-      self-hosted: ${{ needs.determine-platform-params.outputs.self-hosted }}
+      self-hosted: ${{ fromJSON(needs.determine-platform-params.outputs.self-hosted) }}
     secrets: inherit
     permissions:
       contents: read
diff --git a/.github/workflows/e2e_nightly.yaml b/.github/workflows/e2e_nightly.yaml
index 06d3e35ee..6518df6ab 100644
--- a/.github/workflows/e2e_nightly.yaml
+++ b/.github/workflows/e2e_nightly.yaml
@@ -1,4 +1,4 @@
-name: e2e test openssl
+name: e2e test
 
 on:
   schedule:
@@ -21,7 +21,7 @@ jobs:
         test-name:
           [servicemesh, openssl, policy, workloadsecret, volumestatefulset]
       fail-fast: false
-    name: "${{ matrix.platform.name }} / ${{ matrix.test-name }}"
+    name: "${{ matrix.platform.name }}"
     uses: ./.github/workflows/e2e.yaml
     with:
       skip-undeploy: false
diff --git a/.github/workflows/e2e_openssl.yaml b/.github/workflows/e2e_openssl.yaml
index befe61d99..be204b0bf 100644
--- a/.github/workflows/e2e_openssl.yaml
+++ b/.github/workflows/e2e_openssl.yaml
@@ -1,4 +1,4 @@
-name: e2e test openssl
+name: e2e test
 
 on:
   pull_request:
@@ -24,7 +24,7 @@ jobs:
             runner: TDX
             self-hosted: true
       fail-fast: false
-    name: "${{ matrix.platform.name }} / openssl"
+    name: "${{ matrix.platform.name }}"
     uses: ./.github/workflows/e2e.yaml
     with:
       skip-undeploy: false
@@ -32,8 +32,7 @@ jobs:
       platform: ${{ matrix.platform.name }}
       runner: ${{ matrix.platform.runner }}
       self-hosted: ${{ matrix.platform.self-hosted }}
-    secrets:
-      inherit
+    secrets: inherit
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/e2e_service_mesh.yaml b/.github/workflows/e2e_service_mesh.yaml
new file mode 100644
index 000000000..bf0ac9a94
--- /dev/null
+++ b/.github/workflows/e2e_service_mesh.yaml
@@ -0,0 +1,35 @@
+name: e2e test
+
+on:
+  pull_request:
+    paths:
+      - e2e/servicemesh/**
+      - service-mesh/**
+
+jobs:
+  test_matrix:
+    strategy:
+      matrix:
+        platform:
+          - name: AKS-CLH-SNP
+            runner: ubuntu-22.04
+            self-hosted: false
+          - name: K3s-QEMU-SNP
+            runner: SNP
+            self-hosted: true
+          - name: K3s-QEMU-TDX
+            runner: TDX
+            self-hosted: true
+      fail-fast: false
+    name: "${{ matrix.platform.name }}"
+    uses: ./.github/workflows/e2e.yaml
+    with:
+      skip-undeploy: false
+      test-name: servicemesh
+      platform: ${{ matrix.platform.name }}
+      runner: ${{ matrix.platform.runner }}
+      self-hosted: ${{ matrix.platform.self-hosted }}
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write