diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2baf7c..6b7c598 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 v2.5
 - Bug fixes for installation on Linux hosted Universal Orchestrator
+- Bug fix for handling embedded double quotes in alias on Windows servers (2.5.1)
 
 v2.4
 - Add new config.json setting DefaultLinuxPermissionsOnStoreCreation, and certificate store type custom parameter linuxFilePermissionsOnStoreCreation
diff --git a/JavaKeyStoreSSH/RemoteHandlers/WinRMHandler.cs b/JavaKeyStoreSSH/RemoteHandlers/WinRMHandler.cs
index bb75b3b..a667294 100644
--- a/JavaKeyStoreSSH/RemoteHandlers/WinRMHandler.cs
+++ b/JavaKeyStoreSSH/RemoteHandlers/WinRMHandler.cs
@@ -73,7 +73,7 @@ public override string RunCommand(string commandText, object[] parameters, bool
 
                     if (commandText.ToLower().IndexOf("keytool ") > -1)
                     {
-                        commandText = ($"& '{commandText}").Replace("keytool", "keytool'");
+                        commandText = ($"& '{commandText}").Replace("keytool", "keytool'").Replace(@"""",@"\""");
                         commandText = "echo '' | " + commandText;
                     }
                     ps.AddScript(commandText);