diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a267f9d..70b5dc3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,7 +49,7 @@ jobs:
             remote_execution: 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
 
       - name: Set up authentication
         shell: bash
@@ -72,23 +72,28 @@ jobs:
       - "os=linux"
       - "arch=x64"
       - "remote_execution=${{ matrix.remote_execution }}"
+      - "engflow-bento-name=example-gh-x64"
       - "engflow-cluster=glass"
-      - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:1389536c34990e6f49cb38575c2b4f9d08cd3a27e7c3e93c77b7af6260fc5f83"
-      - "engflow-pool=ci_sysbox_x64"
-      - "engflow-runtime=sysbox-runc"
-      - "engflow-runner-id=${{ github.repository_id }}_ci-runners-test-matrix_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
+      - "engflow-job-name=ci-runners-test-matrix-${{matrix.remote_execution}}_${{matrix.allow_bento_snapshot}}"
+      - "engflow-job-type=${{github.event_name}}-${{github.ref_name}}"
       - "engflow-run-id=${{ github.run_id }}"
+      # To avoid a race condition, among all the jobs that use the same Bento in the same repo, only
+      # one should specify "engflow-bento-allow-save=true".
+      - "engflow-bento-allow-save=${{ matrix.allow_bento_snapshot }}"
+
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
         include:
           - remote_execution: 'false'
+            allow_bento_snapshot: 'false'
 
           - remote_execution: 'true'
+            allow_bento_snapshot: 'true'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
 
       - name: Set up authentication
         shell: bash
@@ -110,16 +115,15 @@ jobs:
       - self-hosted
       - "os=linux"
       - "arch=x64"
+      - "engflow-bento-name=example-gh-x64"
       - "engflow-cluster=glass"
-      - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:1389536c34990e6f49cb38575c2b4f9d08cd3a27e7c3e93c77b7af6260fc5f83"
-      - "engflow-pool=ci_sysbox_x64"
-      - "engflow-runtime=sysbox-runc"
-      - "engflow-runner-id=${{ github.repository_id }}_buck2-test_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
+      - "engflow-job-name=ci-runners-test-matrix"
+      - "engflow-job-type=${{github.event_name}}-${{github.ref_name}}"
       - "engflow-run-id=${{ github.run_id }}"
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
 
       - name: Set up Buck2 binary
         shell: bash