diff --git a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
index 2214769efc410..c40145e7d6817 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
@@ -14,11 +14,11 @@ If Not Exist "%NODE%" (
 
 set CONFIG_DIR=%KBN_PATH_CONF%
 If [%KBN_PATH_CONF%] == [] (
-  set CONFIG_DIR=%DIR%\config
+  set "CONFIG_DIR=%DIR%\config"
 )
 
 IF EXIST "%CONFIG_DIR%\node.options" (
-  for /F "eol=# tokens=*" %%i in (%CONFIG_DIR%\node.options) do (
+  for /F "usebackq eol=# tokens=*" %%i in ("%CONFIG_DIR%\node.options") do (
     If [!NODE_OPTIONS!] == [] (
       set "NODE_OPTIONS=%%i"
     )	Else (
diff --git a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
index 0a6d135565e50..d1282f8cf32ac 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
@@ -15,11 +15,11 @@ If Not Exist "%NODE%" (
 
 set CONFIG_DIR=%KBN_PATH_CONF%
 If [%KBN_PATH_CONF%] == [] (
-  set CONFIG_DIR=%DIR%\config
+  set "CONFIG_DIR=%DIR%\config"
 )
 
 IF EXIST "%CONFIG_DIR%\node.options" (
-  for /F "eol=# tokens=*" %%i in (%CONFIG_DIR%\node.options) do (
+  for /F "usebackq eol=# tokens=*" %%i in ("%CONFIG_DIR%\node.options") do (
     If [!NODE_OPTIONS!] == [] (
       set "NODE_OPTIONS=%%i"
     )	Else (
diff --git a/src/dev/build/tasks/bin/scripts/kibana.bat b/src/dev/build/tasks/bin/scripts/kibana.bat
index 19bf8157ed7c8..4fc62804ca9a1 100755
--- a/src/dev/build/tasks/bin/scripts/kibana.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana.bat
@@ -16,11 +16,11 @@ If Not Exist "%NODE%" (
 
 set CONFIG_DIR=%KBN_PATH_CONF%
 If [%KBN_PATH_CONF%] == [] (
-  set CONFIG_DIR=%DIR%\config
+  set "CONFIG_DIR=%DIR%\config"
 )
 
 IF EXIST "%CONFIG_DIR%\node.options" (
-  for /F "eol=# tokens=*" %%i in (%CONFIG_DIR%\node.options) do (
+  for /F "usebackq eol=# tokens=*" %%i in ("%CONFIG_DIR%\node.options") do (
     If [!NODE_OPTIONS!] == [] (
       set "NODE_OPTIONS=%%i"
     )	Else (