diff --git a/.github/workflows/Benchmarks.yml b/.github/workflows/Benchmarks.yml
index 885d8543..6b8c144e 100644
--- a/.github/workflows/Benchmarks.yml
+++ b/.github/workflows/Benchmarks.yml
@@ -29,7 +29,14 @@ jobs:
         cpu: [amd, intel]
         config: [release] # don't want to benchmark debug-builds
 
-    runs-on: ${{ fromJson(format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', matrix.hypervisor == 'hyperv' && 'win2025' || matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor, matrix.cpu)) }} 
+    runs-on: ${{ fromJson(format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}", "JobId=benchmark-{3}-{4}-{5}-{6}"]',
+        matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux',
+        matrix.hypervisor == 'hyperv' && 'win2025' || matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor,
+        matrix.cpu,
+        matrix.config,
+        github.run_id,
+        github.run_number,
+        github.run_attempt)) }} 
     
     steps:
     - uses: actions/checkout@v5
diff --git a/.github/workflows/dep_cargo_publish.yml b/.github/workflows/dep_cargo_publish.yml
index 370be1fa..2a663d6a 100644
--- a/.github/workflows/dep_cargo_publish.yml
+++ b/.github/workflows/dep_cargo_publish.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   publish-hyperlight-wasm:
-    runs-on: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
+    runs-on: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM", "JobId=publish-hyperlight-wasm-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
     steps:
 
       - uses: actions/checkout@v5
diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml
index 757f6961..9dcb5bb2 100644
--- a/.github/workflows/dep_rust.yml
+++ b/.github/workflows/dep_rust.yml
@@ -42,10 +42,14 @@ jobs:
           config: [debug, release]
   
     runs-on: ${{ fromJson(
-        format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', 
+        format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}", "JobId=build-{3}-{4}-{5}-{6}"]', 
           matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', 
           matrix.hypervisor == 'hyperv' && 'win2025' || matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor, 
-          matrix.cpu)) }} 
+          matrix.cpu,
+          matrix.config,
+          github.run_id,
+          github.run_number,
+          github.run_attempt)) }} 
     steps:
       - uses: actions/checkout@v5