diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go
index 92d68fe45f..2d843242cd 100644
--- a/pipeline/frontend/yaml/compiler/convert.go
+++ b/pipeline/frontend/yaml/compiler/convert.go
@@ -84,9 +84,7 @@ func (c *Compiler) createProcess(container *yaml_types.Container, stepType backe
 		detached = true
 	}
 
-	if !detached || len(container.Commands) != 0 {
-		workingDir = c.stepWorkingDir(container)
-	}
+	workingDir = c.stepWorkingDir(container)
 
 	getSecretValue := func(name string) (string, error) {
 		name = strings.ToLower(name)