diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml
index aff289b..4057671 100644
--- a/.azure-pipelines/build.yml
+++ b/.azure-pipelines/build.yml
@@ -33,9 +33,9 @@ jobs:
       set -ex
       sudo apt-get update
       sudo apt-get install -y \
-          libboost-system-dev \
-          libboost-thread-dev \
-          libboost-serialization-dev \
+          libboost-system1.83-dev \
+          libboost-thread1.83-dev \
+          libboost-serialization1.83-dev \
           googletest \
           libgtest-dev \
           libgmock-dev \
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e1bcffc..bbba819 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -40,8 +40,8 @@ jobs:
       - name: prepare
         run: |
           sudo apt-get update
-          sudo apt-get install -y libboost-system-dev \
-            libboost-thread-dev \
+          sudo apt-get install -y libboost-system1.83-dev \
+            libboost-thread1.83-dev \
             libevent-dev \
             libhiredis-dev \
             libnl-3-dev \
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 31e6cdc..5a40333 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,6 +8,13 @@ trigger:
     include:
       - "*"
 
+variables:
+  - name: BUILD_BRANCH
+    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+      value: $(System.PullRequest.TargetBranch)
+    ${{ else }}:
+      value: $(Build.SourceBranchName)
+
 jobs:
 - template: .azure-pipelines/build.yml
   parameters:
@@ -15,15 +22,15 @@ jobs:
     pool:
       vmImage: 'ubuntu-latest'
     codeCoverage: true
-    containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:latest
+    containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)
 - template: .azure-pipelines/build.yml
   parameters:
     arch: arm64
     pool: sonicso1ES-arm64
-    containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm-arm64:latest
+    containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)-arm64
 - template: .azure-pipelines/build.yml
   parameters:
     arch: armhf
     pool: sonicso1ES-armhf
-    containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm-armhf:latest
+    containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)-armhf