diff --git a/workflows/wds-go.cc b/workflows/wds-go.cc
index 2d833630b513d8385e986340d4ce32eac0cd4784..39a4a1db0086aec646223e62a3e8cacbeb4900db 100644
--- a/workflows/wds-go.cc
+++ b/workflows/wds-go.cc
@@ -9,13 +9,13 @@ int main() {
             .addInputSetting("DeploymentName", "DeployVM")
             .addInputSetting("TemplateFilePath", "Resources/ArmTemplates/VM/Template_winserver2016.json")
             .addInputSetting("ParameterFilePath", "Resources/ArmTemplates/VM/Parameters_WDS.json")
-        >> Activity("WaitForCreateVM", "FleetAGC.Activities.QueryAzureVMsActivity")
+        >> Activity("GetVmInfo", "FleetAGC.Activities.QueryAzureVMsActivity")
             .addInputSetting("ResourceGroup", "WdsTest")
         >> Activity("InstallWdsServices", "FleetAGC.Activities.RemotePSActivity")
             .addInputSetting("PublicIP", CS(GlobalSettings["BootstrapWDSPublicIPAddress"]))
             .addInputSetting("UserNameKey", "DC1AdminUserName")
             .addInputSetting("PasswordKey", "DC1AdminPassword")
-            .addInputSetting("ScriptPath", "Resources/PSScript/WdsGo.ps1")
+            .addInputSetting("ScriptPath", "Resources/PSScript/WdsOneClick.ps1")
             .addInputSetting("RequiresSAS","true")
         >> Activity("WaitForWdsInstallFinish", "FleetAGC.Activities.RemotePSActivity")
             .addInputSetting("PublicIP", CS(GlobalSettings["BootstrapWDSPublicIPAddress"]))
@@ -23,13 +23,10 @@ int main() {
             .addInputSetting("PasswordKey", "DC1AdminPassword")
             .addInputSetting("RetryTime", "2000")
             .addInputSetting("RetryInterval", "1")
-            .addInputSetting("ScriptPath", "Resources/PSScript/WdsGo_CheckSuccess.ps1")
+            .addInputSetting("ScriptPath", "Resources/PSScript/WdsOneClick_CheckSuccess.ps1")
         ;
 
     println(to_file("DeployWdsTestServerWorkflow.xaml"), flow.generateXaml("Microsoft.Office.FleetAGC.Workflows.DeployWdsTestServerWorkflow"));
-    println(to_file("BootstrapCAWorkflow.xaml"), flow.generateXaml("Microsoft.Office.FleetAGC.Workflows.BootstrapCAWorkflow"));
+    // println(to_file("BootstrapCAWorkflow.xaml"), flow.generateXaml("Microsoft.Office.FleetAGC.Workflows.BootstrapCAWorkflow"));
 }
 
-// TODO: WDS server requires more UDP port to be opened. But we don't know the client's ip address. 
-//       So, would security team be happy if we open UDP 67 and 69 to public? 
-