diff --git a/lib/utils/device/deploy.ts b/lib/utils/device/deploy.ts
index 9f11a102..8e3e1560 100644
--- a/lib/utils/device/deploy.ts
+++ b/lib/utils/device/deploy.ts
@@ -315,6 +315,8 @@ export async function performBuilds(
 	// Check for failures
 	await inspectBuildResults(localImages);
 
+	const imagesToRemove: string[] = [];
+
 	// Now tag any external images with the correct name that they should be,
 	// as this won't be done by resin-multibuild
 	await Bluebird.map(localImages, async localImage => {
@@ -325,10 +327,14 @@ export async function performBuilds(
 				repo: generateImageName(localImage.serviceName),
 				force: true,
 			});
-			await image.remove({ force: true });
+			imagesToRemove.push(localImage.name!);
 		}
 	});
 
+	await Bluebird.map(_.uniq(imagesToRemove), image =>
+		docker.getImage(image).remove({ force: true }),
+	);
+
 	return buildTasks;
 }