diff --git a/CHANGELOG.md b/CHANGELOG.md
index 756d579d..0f99b97b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and for `resin device init` (same `--config` param)
 ### Fixed
 
 - Ensure emulated builds use the correct relative path to qemu when called from any location
+- Make emulated builds reliable in the presence for WORKDIR comands
 
 ## [5.10.2] - 2017-05-31
 
diff --git a/build/utils/docker.js b/build/utils/docker.js
index 55274490..0796402b 100644
--- a/build/utils/docker.js
+++ b/build/utils/docker.js
@@ -228,7 +228,7 @@ exports.runBuild = function(params, options, getBundleInfo, logStreams) {
             if (options.emulated && platformNeedsQemu()) {
               return transpose.transposeTarStream(buildStream, {
                 hostQemuPath: qemuPath,
-                containerQemuPath: "./" + QEMU_BIN_NAME
+                containerQemuPath: "/tmp/" + QEMU_BIN_NAME
               });
             } else {
               return buildStream;
@@ -243,7 +243,7 @@ exports.runBuild = function(params, options, getBundleInfo, logStreams) {
           if (options.emulated && platformNeedsQemu()) {
             buildThroughStream = transpose.getBuildThroughStream({
               hostQemuPath: qemuPath,
-              containerQemuPath: "./" + QEMU_BIN_NAME
+              containerQemuPath: "/tmp/" + QEMU_BIN_NAME
             });
             newStream = stream.pipe(buildThroughStream);
           } else {
diff --git a/lib/utils/docker.coffee b/lib/utils/docker.coffee
index 9b47e2e8..0fdf121c 100644
--- a/lib/utils/docker.coffee
+++ b/lib/utils/docker.coffee
@@ -234,7 +234,7 @@ exports.runBuild = (params, options, getBundleInfo, logStreams) ->
 						if options.emulated and platformNeedsQemu()
 							return transpose.transposeTarStream buildStream,
 								hostQemuPath: qemuPath
-								containerQemuPath: "./#{QEMU_BIN_NAME}"
+								containerQemuPath: "/tmp/#{QEMU_BIN_NAME}"
 						else
 							return buildStream
 					.then (buildStream) ->
@@ -250,7 +250,7 @@ exports.runBuild = (params, options, getBundleInfo, logStreams) ->
 					if options.emulated and platformNeedsQemu()
 						buildThroughStream = transpose.getBuildThroughStream
 							hostQemuPath: qemuPath
-							containerQemuPath: "./#{QEMU_BIN_NAME}"
+							containerQemuPath: "/tmp/#{QEMU_BIN_NAME}"
 
 						newStream = stream.pipe(buildThroughStream)
 					else