diff --git a/src/apptask.js b/src/apptask.js
index 118699b01..cbb89bbd6 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -657,11 +657,16 @@ async function configureCommand(app, args, progressCallback) {
     await progressCallback({ percent: 40, message: 'Downloading image' });
     await downloadImage(app.manifest);
 
-    await progressCallback({ percent: 45, message: 'Ensuring app data directory' });
+    if (app.manifest.dockerImage.indexOf('local/') === 0) {
+        await progressCallback({ percent: 45, message: 'Building image' });
+        await buildLocalImage(app);
+    }
+
+    await progressCallback({ percent: 50, message: 'Ensuring app data directory' });
     await createAppDir(app);
 
     // re-setup addons since they rely on the app's fqdn (e.g oauth)
-    await progressCallback({ percent: 50, message: 'Setting up addons' });
+    await progressCallback({ percent: 55, message: 'Setting up addons' });
     await services.setupAddons(app, app.manifest.addons);
 
     await progressCallback({ percent: 60, message: 'Creating container' });