diff --git a/lib/index.js b/lib/index.js
index 1e216a16..b0f1f41a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -260,14 +260,22 @@ class Embark {
         engine.startService("libraryManager");
         engine.startService("codeRunner");
         engine.startService("web3");
-        engine.startService("deployment", {onlyCompile: true});
+        engine.startService("pipeline");
+        engine.startService("deployment", {onlyCompile: false});
         engine.startService("storage");
+        engine.startService("codeGenerator");
 
         callback();
       },
       function deploy(callback) {
         engine.events.request('deploy:contracts', function (err) {
-          engine.logger.info("Finished deploying".underline);
+          callback(err);
+        });
+      },
+      function waitForWriteFinish(callback) {
+        engine.logger.info("Finished deploying".underline);
+        engine.events.on('outputDone', (err) => {
+          engine.logger.info(__("finished building").underline);
           callback(err);
         });
       },