diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts
index 139e2732..68642764 100644
--- a/lib/compute/agent-nodes.ts
+++ b/lib/compute/agent-nodes.ts
@@ -148,7 +148,7 @@ export class AgentNodes {
       maxTotalUses: -1,
       minimumNumberOfSpareInstances: 2,
       numExecutors: 1,
-      amiId: 'ami-006c911a4bd898d4a',
+      amiId: 'ami-0805008fb781e18b8',
       initScript: 'echo',
       remoteFs: 'C:\\Users\\Administrator\\jenkins',
     };
@@ -160,7 +160,7 @@ export class AgentNodes {
       maxTotalUses: 1,
       minimumNumberOfSpareInstances: 1,
       numExecutors: 1,
-      amiId: 'ami-006c911a4bd898d4a',
+      amiId: 'ami-0805008fb781e18b8',
       initScript: 'echo',
       remoteFs: 'C:\\Users\\Administrator\\jenkins',
     };
diff --git a/packer/scripts/windows/scoop-install-commons.ps1 b/packer/scripts/windows/scoop-install-commons.ps1
index 73bdb208..49cfaec6 100644
--- a/packer/scripts/windows/scoop-install-commons.ps1
+++ b/packer/scripts/windows/scoop-install-commons.ps1
@@ -56,6 +56,8 @@ $libFound
 $libPathFound = $libFound.replace("$libName", '')
 $libPathFound
 mv -v "$libFound" "$libPathFound\\$libNameRequired"
+# Add MINGW_BIN path to User Env Var for k-NN to retrieve libs
+[System.Environment]::SetEnvironmentVariable("MINGW_BIN", "$libPathFound", "User")
 
 # Install zlib for k-NN compilation requirements
 scoop install zlib