diff --git a/build.sbt b/build.sbt
index 2e4194cd28..2af074dabf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -199,11 +199,10 @@ lazy val node = {
       mappings in Universal ++= directory((resourceDirectory in Compile).value / "chains").map { case (f, name) =>
         f -> s"conf/$name"
       },
-      jdkPackagerJVMArgs := Seq(
-        "-Dconfig.file=." + sep + "conf" + sep + "app.conf",
-        "-Dlogback.configurationFile=." + sep + "conf" + sep + "logback.xml",
-        "-Xss10M"
-      )
+      bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""",
+      bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""",
+      batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\conf\app.conf"""",
+      batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml""""
     )
 
   if (!nixBuild)
diff --git a/src/main/scala/io/iohk/ethereum/App.scala b/src/main/scala/io/iohk/ethereum/App.scala
index 9a516d311f..a8c5c91455 100644
--- a/src/main/scala/io/iohk/ethereum/App.scala
+++ b/src/main/scala/io/iohk/ethereum/App.scala
@@ -35,7 +35,7 @@ object App extends Logger {
       case Some(`cli`) => CliLauncher.main(args.tail)
       case Some(unknown) =>
         log.error(
-          s"Unrecognised launcher option, " +
+          s"Unrecognised launcher option $unknown, " +
             s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, " +
             s"$faucet, $vmServer, $ecKeyGen, $sigValidator or $cli"
         )
diff --git a/src/universal/bin/eckeygen.bat b/src/universal/bin/eckeygen.bat
new file mode 100755
index 0000000000..af652e5679
--- /dev/null
+++ b/src/universal/bin/eckeygen.bat
@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat eckeygen %*
diff --git a/src/universal/bin/faucet-server.bat b/src/universal/bin/faucet-server.bat
new file mode 100755
index 0000000000..8b652a12c9
--- /dev/null
+++ b/src/universal/bin/faucet-server.bat
@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat faucet %*
diff --git a/src/universal/bin/mantis-launcher b/src/universal/bin/mantis-launcher
index 8d4ee8e933..66371b2b80 100755
--- a/src/universal/bin/mantis-launcher
+++ b/src/universal/bin/mantis-launcher
@@ -3,11 +3,10 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/..
 
-chain="$1"
-if [ -z "$chain" ]
-then
-  echo "You need to choose chain"
-else
+CONFIG_FILE="./conf/$1.conf"
+if [ -f "$CONFIG_FILE" ]; then
   shift
-  ./bin/mantis -Dconfig.file=./conf/"$chain".conf "$@"
+  CHAIN_PARAM="-Dconfig.file=$CONFIG_FILE"
 fi
+
+./bin/mantis ${CHAIN_PARAM:+"$CHAIN_PARAM"} "$@"
diff --git a/src/universal/bin/mantis-launcher.bat b/src/universal/bin/mantis-launcher.bat
new file mode 100644
index 0000000000..d0d8a5ff7a
--- /dev/null
+++ b/src/universal/bin/mantis-launcher.bat
@@ -0,0 +1,19 @@
+@echo off
+
+cd "%~dp0\.."
+
+set "CONFIG_FILE=conf\%1.conf"
+set "RESTVAR=%*"
+
+if not exist %CONFIG_FILE% goto :skip
+    set "CHAIN_PARAM=-Dconfig.file=%CONFIG_FILE%"
+    set RESTVAR=
+    shift
+    :loop
+    if "%1"=="" goto skip
+        set RESTVAR=%RESTVAR% %1
+        shift
+        goto loop
+
+:skip
+call bin\mantis.bat %CHAIN_PARAM% %RESTVAR%
diff --git a/src/universal/bin/mantis-vm.bat b/src/universal/bin/mantis-vm.bat
new file mode 100755
index 0000000000..3ceec8de14
--- /dev/null
+++ b/src/universal/bin/mantis-vm.bat
@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat vm-server %*
diff --git a/src/universal/bin/signatureValidator.bat b/src/universal/bin/signatureValidator.bat
new file mode 100755
index 0000000000..6f7f536463
--- /dev/null
+++ b/src/universal/bin/signatureValidator.bat
@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat signature-validator %*
diff --git a/src/universal/conf/application.ini b/src/universal/conf/application.ini
index 3dbf31d102..0234a70184 100644
--- a/src/universal/conf/application.ini
+++ b/src/universal/conf/application.ini
@@ -1 +1 @@
--Dconfig.file=./conf/app.conf -Dlogback.configurationFile=./conf/logback.xml -J-Xmx4g -J-Xss10M
+-J-Xmx4g -J-Xss10M