diff --git a/.pipelines/templates/stages/azl_installer/build-installer-tools.yml b/.pipelines/templates/stages/azl_installer/build-installer-tools.yml
index 15584670d..b78b39e4a 100644
--- a/.pipelines/templates/stages/azl_installer/build-installer-tools.yml
+++ b/.pipelines/templates/stages/azl_installer/build-installer-tools.yml
@@ -21,8 +21,8 @@ stages:
         timeoutInMinutes: 60
         pool:
           type: linux
-          name: trident-ubuntu-1es-pool-eastus2
-          hostArchitecture: amd64
+          # name: trident-ubuntu-1es-pool-eastus2
+          # hostArchitecture: amd64
 
         variables:
           ob_outputDirectory: /tmp/installer-tools
diff --git a/.pipelines/templates/stages/building_tools/building-tools.yml b/.pipelines/templates/stages/building_tools/building-tools.yml
index 75d1fdfee..5524f1ff4 100644
--- a/.pipelines/templates/stages/building_tools/building-tools.yml
+++ b/.pipelines/templates/stages/building_tools/building-tools.yml
@@ -50,8 +50,8 @@ stages:
         pool:
           ${{ if eq(parameters.architecture, 'amd64') }}:
             type: linux
-            name: trident-ubuntu-1es-pool-eastus2
-            hostArchitecture: amd64
+            # name: trident-ubuntu-1es-pool-eastus2
+            # hostArchitecture: amd64
           ${{ if eq(parameters.architecture, 'arm64') }}:
             type: linux
             name: azl3-hci-ARM64-1es-pool-westcentralus
diff --git a/Makefile b/Makefile
index a0be65539..dbd3d45f7 100644
--- a/Makefile
+++ b/Makefile
@@ -500,14 +500,23 @@ bin/liveinstaller: \
 	$(INSTALLER_DIR)/go.sum
 	@mkdir -p bin
 	cd $(INSTALLER_DIR)/liveinstaller && \
-		CGO_ENABLED=0 go build -o $(CURDIR)/$(INSTALLER_OUT_DIR)/liveinstaller
+		if cat /etc/os-release | grep -i azurelinux >/dev/null 2>&1; then \
+			GOEXPERIMENT=ms_nocgo_opensslcrypto go build -o $(CURDIR)/$(INSTALLER_OUT_DIR)/liveinstaller; \
+		else \
+			CGO_ENABLED=0 go build -o $(CURDIR)/$(INSTALLER_OUT_DIR)/liveinstaller; \
+		fi
 
 bin/attendedinstaller-simulator: \
 	$(shell find $(INSTALLER_DIR)/imagegen/ -type f) \
 	$(INSTALLER_DIR)/go.sum
 	@mkdir -p bin
 	cd $(INSTALLER_DIR)/imagegen/attendedinstaller/attendedinstaller_tests && \
-		CGO_ENABLED=0 go build -o $(CURDIR)/$(INSTALLER_OUT_DIR)/attendedinstaller-simulator attendedinstaller_simulator.go
+		if cat /etc/os-release | grep -i azurelinux >/dev/null 2>&1; then \
+			GOEXPERIMENT=ms_nocgo_opensslcrypto go build -o $(CURDIR)/$(INSTALLER_OUT_DIR)/attendedinstaller-simulator attendedinstaller_simulator.go; \
+		else \
+			CGO_ENABLED=0 go build -o $(CURDIR)/$(INSTALLER_OUT_DIR)/attendedinstaller-simulator attendedinstaller_simulator.go; \
+		fi
+		
 
 .PHONY: run-attendedinstaller-simulator
 run-attendedinstaller-simulator: bin/attendedinstaller-simulator