diff --git a/ln.build.server/Program.cs b/ln.build.server/Program.cs
index 9baecb3..7517c8c 100644
--- a/ln.build.server/Program.cs
+++ b/ln.build.server/Program.cs
@@ -65,8 +65,11 @@ namespace ln.build.server
                     CIService.Start();
                     break;
                 case RunMode.build:
-                    CIJob job = new CIJob(CIService,null, (BuildSecret != null) ? CIService.GetSecretStorage(BuildSecret) : null);
+                    CIJob job = new CIJob(CIService, null, (BuildSecret != null) ? CIService.GetSecretStorage(BuildSecret) : null);
+                    
                     job.WorkingDirectory = BuildPath;
+                    job.Environment.WorkingDirectory = BuildPath;
+
                     job.RunJob();
                     break;
                 case RunMode.versioning:
diff --git a/ln.build/CIJob.cs b/ln.build/CIJob.cs
index e84f976..8593f83 100644
--- a/ln.build/CIJob.cs
+++ b/ln.build/CIJob.cs
@@ -55,7 +55,7 @@ namespace ln.build
             Logger = new Logger(new FileLogger(Path.Combine(ciService.ReportsDirectory, JobID, "build.log")));
             Logger.Backends.Add(Logger.ConsoleLogger);
 
-            Environment = new CommandEnvironment(){ CIJob = this };
+            Environment = new CommandEnvironment(){ CIJob = this, WorkingDirectory = WorkingDirectory };
         }
 
         public Stream GetLogStream(string name)