diff --git a/lib/utils/device/deploy.ts b/lib/utils/device/deploy.ts
index 54838a73fb..74393bdff6 100644
--- a/lib/utils/device/deploy.ts
+++ b/lib/utils/device/deploy.ts
@@ -527,17 +527,16 @@ async function assignDockerBuildOpts(
 
 	await Promise.all(
 		buildTasks.map(async (task: BuildTask) => {
-			task.dockerOpts = {
-				cachefrom: images,
-				labels: {
-					'io.resin.local.image': '1',
-					'io.resin.local.service': task.serviceName,
-				},
-				t: generateImageName(task.serviceName),
-				nocache: opts.nocache,
-				forcerm: true,
-				pull: opts.pull,
+			task.dockerOpts = task.dockerOpts || {};
+			task.dockerOpts.cachefrom = images;
+			task.dockerOpts.labels = {
+				'io.resin.local.image': '1',
+				'io.resin.local.service': task.serviceName,
 			};
+			task.dockerOpts.t = generateImageName(task.serviceName);
+			task.dockerOpts.nocache = opts.nocache;
+			task.dockerOpts.forcerm = true;
+			task.dockerOpts.pull = opts.pull;
 			if (task.external) {
 				task.dockerOpts.authconfig = await getAuthConfigObj(
 					task.imageName!,