diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index be894c0a2..8c4a3af87 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -26,9 +26,6 @@ parameters:
   type: number
   default: 600
 
-- name: sonic_slave
-  type: string
-
 - name: artifact_name
   type: string
 
@@ -42,7 +39,7 @@ jobs:
   timeoutInMinutes: ${{ parameters.timeout }}
 
   container:
-    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:202505
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:$(BUILD_BRANCH)-${{ parameters.arch }}
 
   steps:
   - checkout: self
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 41abd26d6..b81a741fd 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)
+
 stages:
 - stage: Build
 
@@ -15,7 +22,6 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: amd64
-      sonic_slave: sonic-slave-bookworm
       artifact_name: sonic-linux-kernel
       linux_deb_pattern: linux-image-*-unsigned_*deb
 
@@ -23,7 +29,6 @@ stages:
     parameters:
       arch: arm64
       pool: sonicso1ES-arm64
-      sonic_slave: sonic-slave-bookworm-arm64
       artifact_name: sonic-linux-kernel.arm64
       linux_deb_pattern: linux-image-*-unsigned_*deb
 
@@ -31,7 +36,6 @@ stages:
     parameters:
       arch: armhf
       pool: sonicso1ES-armhf
-      sonic_slave: sonic-slave-bookworm-armhf
       artifact_name: sonic-linux-kernel.armhf
       linux_deb_pattern: linux-image-*-armmp_*deb
 
@@ -40,7 +44,6 @@ stages:
       arch: arm64
       platform: pensando
       pool: sonicso1ES-arm64
-      sonic_slave: sonic-slave-bookworm-arm64
       artifact_name: sonic-linux-kernel.pensando.arm64
       linux_deb_pattern: linux-image-*-unsigned_*deb