diff --git a/contrib/aws/Jenkinsfile b/contrib/aws/Jenkinsfile
index 80ab2091262..cf7e5429339 100644
--- a/contrib/aws/Jenkinsfile
+++ b/contrib/aws/Jenkinsfile
@@ -70,8 +70,8 @@ pipeline {
                     stages["1_g4dn_centos7_shm"] = common.get_test_stage("1_g4dn_centos7_shm", env.BUILD_TAG, "centos7", "g4dn.8xlarge", 1, "us-east-1", "libfabric_pr_test.yaml", addl_args_pr + "--test-libfabric-provider shm")
                     stages["1_g4dn_ubuntu2004_shm_disable-cma"] = common.get_test_stage("1_g4dn_ubuntu2004_shm_disable-cma", env.BUILD_TAG, "ubuntu2004", "g4dn.8xlarge", 1, "us-east-1", "libfabric_pr_test.yaml", addl_args_pr + "--test-libfabric-provider shm --enable-cma false")
 
-                    // TODO: Get Single Node Windows test working
-                    // stages["EFA_Windows_Test"] = common.get_single_node_windows_test_stage("EFA_Windows_Test")
+                    // Single Node Windows Test
+                    stages["EFA_Windows_Test"] = common.get_single_node_windows_test_stage("EFA_Windows_Test")
 
                     // Multi Node Tests - EFA
                     stages["2_hpc6a_alinux2_efa"] = common.get_test_stage("2_hpc6a_alinux2_efa", env.BUILD_TAG, "alinux2", "hpc6a.48xlarge", 2, "eu-north-1", "libfabric_pr_test.yaml", addl_args_pr)
@@ -114,7 +114,8 @@ pipeline {
         }
         failure {
             sh '''
-            echo FAILURE
+                . venv/bin/activate
+                ./PortaFiducia/scripts/delete_manual_cluster.py --cluster-name WindowsLibfabricCi_${env.CHANGE_ID}_*
             '''
         }
         aborted {
diff --git a/contrib/aws/common.groovy b/contrib/aws/common.groovy
index 4a128537b83..d9c6db36e4a 100644
--- a/contrib/aws/common.groovy
+++ b/contrib/aws/common.groovy
@@ -97,7 +97,12 @@ def get_single_node_windows_test_stage(stage_name) {
     return {
         stage("${stage_name}") {
             def ret = sh (
-                            script: ". venv/bin/activate; cd PortaFiducia/scripts; env AWS_DEFAULT_REGION=us-west-2 ./test_orchestrator_windows.py public",
+                            script: """
+                                . venv/bin/activate;
+                                cd PortaFiducia/scripts;
+                                export PULL_REQUEST_ID=${env.CHANGE_ID};
+                                env AWS_DEFAULT_REGION=us-west-2 ./test_orchestrator_windows.py --ci public --s3-bucket-name libfabric-ci-windows-prod-test-output --pull-request-id ${env.CHANGE_ID};
+                            """,
                             returnStatus: true
                          )
             if (ret == 65)