diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 55e9ebe8d..434a2e0e2 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -90,7 +90,7 @@ jobs:
             version: 14
           local_conf_header:
             build-id: |
-              BUILD_ID = "${BUILD_ID}"
+              QCOM_BUILD_ID = "${BUILD_ID}"
           EOF
         env:
           INPUTS_CACHE_DIR: ${{inputs.cache_dir}}
diff --git a/ci/base.yml b/ci/base.yml
index ff38fc737..f967a62aa 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -69,7 +69,9 @@ local_conf_header:
     # Use a weak assignment so the CI override wins regardless of how kas
     # orders the merged local.conf fragments.
     OS_RELEASE_FIELDS:append = " BUILD_ID"
-    BUILD_ID ?= "local-${DATETIME}"
+    QCOM_BUILD_ID ?= "local-${DATETIME}"
+    BUILD_ID ?= "${QCOM_BUILD_ID}"
+    BUILD_ID[vardepsexclude] ?= "QCOM_BUILD_ID"
 
 machine: unset