diff --git a/.pipelines/templates/.builder-release-template-windows.yaml b/.pipelines/templates/.builder-release-template-windows.yaml
index 1cc57861006..83f5690fa19 100644
--- a/.pipelines/templates/.builder-release-template-windows.yaml
+++ b/.pipelines/templates/.builder-release-template-windows.yaml
@@ -130,10 +130,7 @@ steps:
     env:
       WINDOWS_SKU: ${{ parameters.windowsSku }}
 
-  - script: |
-      #      -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
-      #      -w /go/src/github.com/Azure/AgentBaker
-      make -f packer.mk run-packer-windows
+  - script: make -f packer.mk run-packer-windows
     displayName: Building windows VHD
     env:
       MODE: $(MODE)
@@ -175,10 +172,7 @@ steps:
       
       echo "##vso[task.setvariable variable=TEST_VM_RESOURCE_GROUP_NAME]$TEST_VM_RESOURCE_GROUP_NAME"
 
-      #      -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
-      #      -w /go/src/github.com/Azure/AgentBaker \
-
-       make -f packer.mk test-building-vhd
+      make -f packer.mk test-building-vhd
     displayName: Run VHD cache test
     env:
       SUBSCRIPTION_ID: $(AZURE_BUILD_SUBSCRIPTION_ID)
@@ -230,9 +224,7 @@ steps:
   - bash: |
       export SIG_IMAGE_NAME="$(cat vhdbuilder/packer/settings.json | grep "sig_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')"
       export CAPTURED_SIG_VERSION="$(cat vhdbuilder/packer/settings.json | grep "captured_sig_version" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')"
-      #        -v ${PWD}:/go/src/github.com/Azure/AgentBaker
-      #        -w /go/src/github.com/Azure/AgentBaker
-      
+
       make -f packer.mk convert-sig-to-classic-storage-account-blob
     displayName: Convert Shared Image Gallery To VHD Blob In Classic Storage Account
     condition: and(eq(variables.DRY_RUN, 'False'), eq(variables.SIG_FOR_PRODUCTION, 'True'))
@@ -262,9 +254,6 @@ steps:
       export IMPORTED_IMAGE_NAME="$(cat vhdbuilder/packer/settings.json | grep "imported_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" 
       export SIG_IMAGE_NAME="$(cat vhdbuilder/packer/settings.json | grep "sig_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')"
       export IMAGE_NAME="$(cat packer-output | grep -a "ManagedImageName:" | cut -d " " -f 2)"
-      #      docker run --rm \
-      #      -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
-      #      -w /go/src/github.com/Azure/AgentBaker \
 
       make -f packer.mk cleanup
     displayName: Clean Up Packer Generated Resources
@@ -296,10 +285,6 @@ steps:
         export VHD_NAME="$(echo $OS_DISK_SAS | cut -d "/" -f 8 | cut -d "?" -f 1)"; 
       fi
       export SKU_NAME="windows-$WINDOWS_SKU"; 
-
-      #      docker run --rm \
-      #      -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
-      #      -w /go/src/github.com/Azure/AgentBaker \
       
       make -f packer.mk generate-publishing-info
     displayName: Getting Shared Access Signature URI