diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a2f2d4b7..3b55a7c3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -308,6 +308,7 @@ jobs:
 
 - job: BuildDockerImages
   displayName: 'Build Docker Images'
+  dependsOn: CodeFormatValidation
   pool:
     vmImage: 'ubuntu-latest'
   steps:
@@ -316,17 +317,13 @@ jobs:
       docker buildx inspect --bootstrap
     displayName: 'Set up Docker Buildx'
 
-  - script: |
-      docker buildx create --use
-      docker buildx inspect --bootstrap
-    displayName: 'Create and Inspect Buildx Builder'
-
   - script: |
       docker buildx build --no-cache --platform linux/amd64,linux/arm64 \
         --file $(Build.SourcesDirectory)/docker/Dockerfile \
         --file $(Build.SourcesDirectory)/docker/Dockerfile.aarch64 \
         -t yacreaderlibraryserver:develop \
-        --output type=docker,dest=$(Build.ArtifactStagingDirectory)/multiarch.tar
+        --output type=docker,dest=$(Build.ArtifactStagingDirectory)/multiarch.tar \
+        $(Build.SourcesDirectory)/docker
     displayName: 'Build and Push Multi-Platform Docker Image'
 
 #