diff --git a/.ci/pipelines/base-pipeline.yml b/.ci/pipelines/base-pipeline.yml
index ae9e323..f231fb7 100644
--- a/.ci/pipelines/base-pipeline.yml
+++ b/.ci/pipelines/base-pipeline.yml
@@ -40,4 +40,4 @@ jobs:
         pr: ((.:pr))
         gitea_api_key: ((gitea_api_key))
       instance_vars:
-        n: ((.:pr.number))
+        number: ((.:pr.number))
diff --git a/.ci/pipelines/pr.yml b/.ci/pipelines/pr.yml
index 146f987..a9060f9 100644
--- a/.ci/pipelines/pr.yml
+++ b/.ci/pipelines/pr.yml
@@ -37,7 +37,6 @@ resources:
     url: http://forgejo:3000
     owner: bitsquid_dt
     repo: dtmt
-    sha: ((pr.head.sha))
     context: lint/clippy
     description: Checking for common mistakes and opportunities for code improvement
 
@@ -48,7 +47,6 @@ resources:
     url: http://forgejo:3000
     owner: bitsquid_dt
     repo: dtmt
-    sha: ((pr.head.sha))
     context: build/msvc
     description: "Build for the target platform: msvc"
 
@@ -59,7 +57,6 @@ resources:
     url: http://forgejo:3000
     owner: bitsquid_dt
     repo: dtmt
-    sha: ((pr.head.sha))
     context: build/linux
     description: "Build for the target platform: linux"
 
@@ -72,6 +69,7 @@ jobs:
     no_get: true
     params:
       state: success
+      sha: ((.:git_sha))
 
   on_failure:
     put: state-failure
@@ -79,16 +77,21 @@ jobs:
     no_get: true
     params:
       state: failure
+      sha: ((.:git_sha))
 
   plan:
+  - get: repo
+    trigger: true
+
+  - load_var: git_sha
+    file: repo/.git/ref
+
   - put: state-pending
     resource: pr-status-lint-clippy
     no_get: true
     params:
       state: pending
-
-  - get: repo
-    trigger: true
+      sha: ((.:git_sha))
 
   - task: check
     file: repo/.ci/tasks/clippy.yml
@@ -103,6 +106,7 @@ jobs:
     no_get: true
     params:
       state: success
+      sha: ((.:git_sha))
 
   on_failure:
     put: state-failure
@@ -110,16 +114,21 @@ jobs:
     no_get: true
     params:
       state: failure
+      sha: ((.:git_sha))
 
   plan:
+  - get: repo
+    trigger: true
+
+  - load_var: git_sha
+    file: repo/.git/ref
+
   - put: state-pending
     resource: pr-status-build-msvc
     no_get: true
     params:
       state: pending
-
-  - get: repo
-    trigger: true
+      sha: ((.:git_sha))
 
   - task: build
     file: repo/.ci/tasks/build.yml
@@ -154,6 +163,7 @@ jobs:
     no_get: true
     params:
       state: success
+      sha: ((.:git_sha))
 
   on_failure:
     put: state-failure
@@ -161,16 +171,21 @@ jobs:
     no_get: true
     params:
       state: failure
+      sha: ((.:git_sha))
 
   plan:
+  - get: repo
+    trigger: true
+
+  - load_var: git_sha
+    file: repo/.git/ref
+
   - put: state-pending
     resource: pr-status-build-linux
     no_get: true
     params:
       state: pending
-
-  - get: repo
-    trigger: true
+      sha: ((.:git_sha))
 
   - task: build
     file: repo/.ci/tasks/build.yml
diff --git a/Justfile b/Justfile
index 964dc1f..70af61a 100644
--- a/Justfile
+++ b/Justfile
@@ -29,7 +29,7 @@ ci-image-linux:
     docker push registry.sclu1034.dev/dtmt-ci-base-linux
 
 set-base-pipeline:
-    fly -t ((fly_target)) set-pipeline \
+    fly -t {{fly_target}} set-pipeline \
         --pipeline dtmt-prs \
         --config .ci/pipelines/base-pipeline.yml \
         -v gitea_api_key=${GITEA_API_KEY} \
@@ -46,7 +46,7 @@ set-pr-pipeline pr:
         --pipeline dtmt-pr \
         --config .ci/pipelines/pr.yml \
         -v gitea_api_key=${GITEA_API_KEY} \
-        -i n={{pr}} \
+        -i number={{pr}} \
         -y branch="$(yq -y '.head.ref' 'pr-{{pr}}.yaml')" \
         -y pr="$(cat 'pr-{{pr}}.yaml')"