diff --git a/eng/pipelines/daily-verification.yml b/eng/pipelines/daily-verification.yml
index daa7d3e69..0463fa74c 100644
--- a/eng/pipelines/daily-verification.yml
+++ b/eng/pipelines/daily-verification.yml
@@ -4,7 +4,7 @@ jobs:
     displayName: Daily vcpkg PR
     pool:
       name: $(WINDOWSPOOL)
-      demands: $(WindowsImageDemand)
+      demands: ImageOverride -equals $(WINDOWSVMIMAGE)
 
     variables:
       # The branch in the azure-sdk/vcpkg repo that is updated daily with the
diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml
index b76d049b4..d6ace0e2d 100644
--- a/eng/pipelines/templates/variables/image.yml
+++ b/eng/pipelines/templates/variables/image.yml
@@ -22,8 +22,3 @@ variables:
     value: windows
   - name: MACOS
     value: macOS
-
-  - name: LinuxImageDemand
-    value: ImageOverride -equals $(LINUXVMIMAGE)
-  - name: WindowsImageDemand
-    value: ImageOverride -equals $(WINDOWSVMIMAGE)
\ No newline at end of file
diff --git a/sdk/core/azure-core-amqp/Test-Setup.ps1 b/sdk/core/azure-core-amqp/Test-Setup.ps1
index 3ce7eb98c..5e85a2de8 100644
--- a/sdk/core/azure-core-amqp/Test-Setup.ps1
+++ b/sdk/core/azure-core-amqp/Test-Setup.ps1
@@ -32,7 +32,7 @@ try {
 
   Set-Location -Path "./azure-amqp/test/TestAmqpBroker"
 
-  Invoke-LoggedCommand "dotnet build -p RollForward=LatestMajor --framework net6.0"
+  Invoke-LoggedCommand "dotnet build -p RollForward=LatestMajor --framework net8.0"
   if (!$? -ne 0) {
     Write-Error "Failed to build TestAmqpBroker."
     exit 1
@@ -43,7 +43,7 @@ try {
   # now that the Test broker has been built, launch the broker on a local address.
   Write-Host "Starting test broker listening on ${env:TEST_BROKER_ADDRESS} ..."
 
-  Set-Location -Path $WorkingDirectory/azure-amqp/bin/Debug/TestAmqpBroker/net6.0
+  Set-Location -Path $WorkingDirectory/azure-amqp/bin/Debug/TestAmqpBroker/net8.0
 
 #  $job = dotnet exec ./TestAmqpBroker.dll ${env:TEST_BROKER_ADDRESS} /headless &
   $Process = Start-Process -NoNewWindow -FilePath "dotnet" -ArgumentList "exec ./TestAmqpBroker.dll ${env:TEST_BROKER_ADDRESS} /headless" -PassThru  -RedirectStandardOutput $WorkingDirectory/test-broker.log -RedirectStandardError $WorkingDirectory/test-broker-error.log
diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml
index b694d0f12..2d68f00aa 100644
--- a/sdk/core/ci.yml
+++ b/sdk/core/ci.yml
@@ -58,6 +58,7 @@ extends:
       PreTestSteps:
         - pwsh: |
             $(Build.SourcesDirectory)/sdk/core/azure-core-amqp/Test-Setup.ps1
+          displayName: Test-Setup for azure-core-amqp
           env:
             TEST_BROKER_ADDRESS: "amqp://127.0.0.1:25672"