diff --git a/lib/compute/agent-node-config.ts b/lib/compute/agent-node-config.ts
index 7acfe69..2e21239 100644
--- a/lib/compute/agent-node-config.ts
+++ b/lib/compute/agent-node-config.ts
@@ -345,7 +345,7 @@ export class AgentNodeConfig {
       idleTerminationMinutes: '120',
       initScript: config.initScript,
       labelString: config.workerLabelString[0],
-      launchTimeoutStr: '1200',
+      launchTimeoutStr: '1600',
       maxTotalUses: config.maxTotalUses,
       minimumNumberOfInstances: 0,
       minimumNumberOfSpareInstances: config.minimumNumberOfSpareInstances,
diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts
index 83af021..e1f3ba1 100644
--- a/lib/compute/agent-nodes.ts
+++ b/lib/compute/agent-nodes.ts
@@ -208,7 +208,7 @@ export class AgentNodes {
       maxTotalUses: 10,
       minimumNumberOfSpareInstances: 4,
       numExecutors: 3,
-      amiId: 'ami-01f81782f09e99d95',
+      amiId: 'ami-021eaef5ecf03ae4c',
       initScript: 'echo %USERNAME% && dockerd --register-service && net start docker && echo started docker deamon && docker ps && '
         + 'echo initializing docker images now waiting for 5min && git clone https://github.com/opensearch-project/opensearch-build.git && '
         + 'bash.exe -c "docker run --rm -it  --name docker-windows-test -d `opensearch-build/docker/ci/get-ci-images.sh '
@@ -225,7 +225,7 @@ export class AgentNodes {
       maxTotalUses: 10,
       minimumNumberOfSpareInstances: 1,
       numExecutors: 1,
-      amiId: 'ami-01f81782f09e99d95',
+      amiId: 'ami-021eaef5ecf03ae4c',
       initScript: 'echo %USERNAME% && dockerd --register-service && net start docker && echo started docker deamon && docker ps && '
         + 'echo initializing docker images now waiting for 5min && git clone https://github.com/opensearch-project/opensearch-build.git && '
         + 'bash.exe -c "docker run --rm -it  --name docker-windows-test -d `opensearch-build/docker/ci/get-ci-images.sh '