diff --git a/.pipelines/templates/.builder-release-template.yaml b/.pipelines/templates/.builder-release-template.yaml
index 82159ae87c4..f5510789439 100644
--- a/.pipelines/templates/.builder-release-template.yaml
+++ b/.pipelines/templates/.builder-release-template.yaml
@@ -38,7 +38,7 @@ steps:
         exit 1
       fi
       echo "Found source components.json to use for overrides: ${COMPONENT_JSON_SRC}"
-      
+
       echo "Overwriting component.json from ${COMPONENT_JSON_SRC} -> ${COMPONENT_JSON_DEST}"
       cp -af "${COMPONENT_JSON_SRC}" "${COMPONENT_JSON_DEST}"
     displayName: Apply Overrides
@@ -106,6 +106,10 @@ steps:
       echo "##vso[task.setvariable variable=SKU_NAME]$SKU_NAME"
       echo "Set SKU_NAME to $SKU_NAME"
     displayName: Set SKU Name
+  - bash: |
+      ./build.sh
+    displayName: Build Installer
+    workingDirectory: installer
   - bash: |
       echo MODE=$(MODE) && \
       docker run --rm \
@@ -149,9 +153,6 @@ steps:
       ${CONTAINER_IMAGE} make -f packer.mk run-packer
     retryCountOnTaskFailure: 3
     displayName: Building VHD
-  - bash: |
-      ./installer/build.sh
-    displayName: Build Installer
   - bash: |
       OS_DISK_URI="$(cat packer-output | grep "OSDiskUri:" | cut -d " " -f 2)" && \
       MANAGED_SIG_ID="$(cat packer-output | grep "ManagedImageSharedImageGalleryId:" | cut -d " " -f 2)" && \
diff --git a/installer/build.sh b/installer/build.sh
index 85f100f8fcb..7d9415e997c 100755
--- a/installer/build.sh
+++ b/installer/build.sh
@@ -1,4 +1,3 @@
-rm -r dist
 GOOS=linux GOARCH=amd64 go build -o ./dist/installer-linux-amd64
 GOOS=linux GOARCH=arm64 go build -o ./dist/installer-linux-arm64
 GOOS=windows GOARCH=amd64 go build -o ./dist/installer-windows-amd64.exe
diff --git a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
index fe8a7dab76d..f6b3820ab5f 100644
--- a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
+++ b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
@@ -91,7 +91,7 @@
     },
     {
       "type": "file",
-      "source": "dist/installer-linux-arm64",
+      "source": "installer/dist/installer-linux-arm64",
       "destination": "/home/packer/installer"
     },
     {
diff --git a/vhdbuilder/packer/vhd-image-builder-base.json b/vhdbuilder/packer/vhd-image-builder-base.json
index 46d151b9c37..3e4231bb73a 100644
--- a/vhdbuilder/packer/vhd-image-builder-base.json
+++ b/vhdbuilder/packer/vhd-image-builder-base.json
@@ -93,7 +93,7 @@
     },
     {
       "type": "file",
-      "source": "dist/installer-linux-amd64",
+      "source": "installer/dist/installer-linux-amd64",
       "destination": "/home/packer/installer"
     },
     {
diff --git a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json
index f827dc9e3cc..ab92a40c201 100644
--- a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json
+++ b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json
@@ -90,7 +90,7 @@
     },
     {
       "type": "file",
-      "source": "dist/installer-linux-arm64",
+      "source": "installer/dist/installer-linux-arm64",
       "destination": "/home/packer/installer"
     },
     {
diff --git a/vhdbuilder/packer/vhd-image-builder-mariner.json b/vhdbuilder/packer/vhd-image-builder-mariner.json
index ea4b69c82a7..b89849004f8 100644
--- a/vhdbuilder/packer/vhd-image-builder-mariner.json
+++ b/vhdbuilder/packer/vhd-image-builder-mariner.json
@@ -92,7 +92,7 @@
     },
     {
       "type": "file",
-      "source": "dist/installer-linux-amd64",
+      "source": "installer/dist/installer-linux-amd64",
       "destination": "/home/packer/installer"
     },
     {