diff --git a/quick-include.hpp b/quick-include.hpp
index 4d218f3a68ebc3d0df644eb827241d312bd1af39..dc9a1f714ed3404d89d10fa5ede6d3cd04f4fbc3 100644
--- a/quick-include.hpp
+++ b/quick-include.hpp
@@ -28,4 +28,6 @@ inline auto &DefaultMetadata(std::string className) {
 }
 }
 
-#endif
\ No newline at end of file
+#define CS(rawCode) (Utility::CSharpExpr {#rawCode} .unescapeThisExprInQuotedCSharpString())
+
+#endif
diff --git a/workflows/wds-go.cc b/workflows/wds-go.cc
index decb99495ef57eb10c0b224e36ea9f2fc31dff10..2d833630b513d8385e986340d4ce32eac0cd4784 100644
--- a/workflows/wds-go.cc
+++ b/workflows/wds-go.cc
@@ -12,14 +12,13 @@ int main() {
         >> Activity("WaitForCreateVM", "FleetAGC.Activities.QueryAzureVMsActivity")
             .addInputSetting("ResourceGroup", "WdsTest")
         >> Activity("InstallWdsServices", "FleetAGC.Activities.RemotePSActivity")
-            .addInputSetting("PublicIP", "\" + GlobalSettings[\"BootstrapWDSPublicIPAddress\"] + \"")
+            .addInputSetting("PublicIP", CS(GlobalSettings["BootstrapWDSPublicIPAddress"]))
             .addInputSetting("UserNameKey", "DC1AdminUserName")
             .addInputSetting("PasswordKey", "DC1AdminPassword")
             .addInputSetting("ScriptPath", "Resources/PSScript/WdsGo.ps1")
             .addInputSetting("RequiresSAS","true")
-            .addInputSetting("ConnectionStringKey","BootstrapPocStorageAccount")
         >> Activity("WaitForWdsInstallFinish", "FleetAGC.Activities.RemotePSActivity")
-            .addInputSetting("PublicIP", "\" + GlobalSettings[\"BootstrapWDSPublicIPAddress\"] + \"")
+            .addInputSetting("PublicIP", CS(GlobalSettings["BootstrapWDSPublicIPAddress"]))
             .addInputSetting("UserNameKey", "DC1AdminUserName")
             .addInputSetting("PasswordKey", "DC1AdminPassword")
             .addInputSetting("RetryTime", "2000")