diff --git a/build/aro/webapp-container-build.yml b/build/aro/webapp-container-build.yml
index 1ea39133a..a786ae543 100644
--- a/build/aro/webapp-container-build.yml
+++ b/build/aro/webapp-container-build.yml
@@ -48,7 +48,7 @@ jobs:
       $pinfo.RedirectStandardError = $true
       $pinfo.RedirectStandardOutput = $true
       $pinfo.UseShellExecute = $false
-      $pinfo.Arguments = "start-build $(AppName) --from-dir='$(Pipeline.Workspace)\\$(ProjectName)' --follow --wait"
+      $pinfo.Arguments = "start-build $(AppName) --from-dir=$(ProjectName) --follow --wait"
       $p = New-Object System.Diagnostics.Process
       $p.StartInfo = $pinfo
       $p.Start() | Out-Null
@@ -61,8 +61,5 @@ jobs:
       $binaryBuildHasErrors = $p.ExitCode -ne 0
       Write-Host "##vso[task.setvariable variable=BinaryBuildHasErrors;]$binaryBuildHasErrors"
     displayName: 'Start OpenShift Binary Build'
-    failOnStderr: variables['BinaryBuildHasErrors']
-
-
-
-
+    failOnStderr: and(succeeded(), eq(variables['BinaryBuildHasErrors'], False))
+    workingDirectory:  '$(Pipeline.Workspace)'
\ No newline at end of file