diff --git a/lib/roles/device.js b/lib/roles/device.js
index cc370c58..74f9beb0 100644
--- a/lib/roles/device.js
+++ b/lib/roles/device.js
@@ -6,13 +6,13 @@ module.exports = function(options) {
   // Show serial number in logs
   logger.setGlobalIdentifier(options.serial)
 
-  return syrup()
+  return syrup.serial()
     // We want to send logs before anything else start happening
     .dependency(require('./device/plugins/logsender'))
     .define(function(options) {
       var log = logger.createLogger('device')
       log.info('Preparing device')
-      return syrup()
+      return syrup.serial()
         .dependency(require('./device/plugins/solo'))
         .dependency(require('./device/plugins/heartbeat'))
         .dependency(require('./device/plugins/display'))
diff --git a/lib/roles/device/plugins/display.js b/lib/roles/device/plugins/display.js
index 9af6a71d..cac8f633 100644
--- a/lib/roles/device/plugins/display.js
+++ b/lib/roles/device/plugins/display.js
@@ -2,7 +2,7 @@ var syrup = require('syrup')
 
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('./http'))
   .define(function(options, http) {
     var log = logger.createLogger('device:plugins:display')
diff --git a/lib/roles/device/plugins/heartbeat.js b/lib/roles/device/plugins/heartbeat.js
index a63201a2..29c6f00f 100644
--- a/lib/roles/device/plugins/heartbeat.js
+++ b/lib/roles/device/plugins/heartbeat.js
@@ -3,7 +3,7 @@ var syrup = require('syrup')
 var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/push'))
   .define(function(options, push) {
     function heartbeat() {
diff --git a/lib/roles/device/plugins/http.js b/lib/roles/device/plugins/http.js
index a1b20e0e..b6447a96 100644
--- a/lib/roles/device/plugins/http.js
+++ b/lib/roles/device/plugins/http.js
@@ -11,7 +11,7 @@ var split = require('split')
 var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
diff --git a/lib/roles/device/plugins/identity.js b/lib/roles/device/plugins/identity.js
index 484da891..9eb288e3 100644
--- a/lib/roles/device/plugins/identity.js
+++ b/lib/roles/device/plugins/identity.js
@@ -3,7 +3,7 @@ var syrup = require('syrup')
 var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/properties'))
   .dependency(require('./display'))
   .define(function(options, properties, display) {
diff --git a/lib/roles/device/plugins/input.js b/lib/roles/device/plugins/input.js
index 3e7db466..8e42ed1d 100644
--- a/lib/roles/device/plugins/input.js
+++ b/lib/roles/device/plugins/input.js
@@ -11,7 +11,7 @@ var keyutil = require('../../../util/keyutil')
 var streamutil = require('../../../util/streamutil')
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/router'))
   .dependency(require('../support/push'))
diff --git a/lib/roles/device/plugins/logcat.js b/lib/roles/device/plugins/logcat.js
index aa0fe5f1..0856d13e 100644
--- a/lib/roles/device/plugins/logcat.js
+++ b/lib/roles/device/plugins/logcat.js
@@ -4,7 +4,7 @@ var logger = require('../../../util/logger')
 var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/router'))
   .dependency(require('../support/quit'))
diff --git a/lib/roles/device/plugins/logsender.js b/lib/roles/device/plugins/logsender.js
index 1633a44c..03ed2fa3 100644
--- a/lib/roles/device/plugins/logsender.js
+++ b/lib/roles/device/plugins/logsender.js
@@ -5,7 +5,7 @@ var logger = require('../../../util/logger')
 var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/push'))
   .dependency(require('../support/quit'))
   .define(function(options, push, quit) {
diff --git a/lib/roles/device/plugins/owner.js b/lib/roles/device/plugins/owner.js
index bf945de0..e0cf05b3 100644
--- a/lib/roles/device/plugins/owner.js
+++ b/lib/roles/device/plugins/owner.js
@@ -6,7 +6,7 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 var devutil = require('../../../util/devutil')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('./identity'))
   .dependency(require('./input'))
   .dependency(require('../support/router'))
diff --git a/lib/roles/device/plugins/shell.js b/lib/roles/device/plugins/shell.js
index 25790848..0467e190 100644
--- a/lib/roles/device/plugins/shell.js
+++ b/lib/roles/device/plugins/shell.js
@@ -5,7 +5,7 @@ var logger = require('../../../util/logger')
 var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/router'))
   .dependency(require('../support/push'))
diff --git a/lib/roles/device/plugins/solo.js b/lib/roles/device/plugins/solo.js
index 957199b6..3c2c8d28 100644
--- a/lib/roles/device/plugins/solo.js
+++ b/lib/roles/device/plugins/solo.js
@@ -4,7 +4,7 @@ var logger = require('../../../util/logger')
 var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/sub'))
   .dependency(require('../support/push'))
   .dependency(require('../support/channels'))
diff --git a/lib/roles/device/plugins/stats.js b/lib/roles/device/plugins/stats.js
index 32ddcafb..caa6a4ea 100644
--- a/lib/roles/device/plugins/stats.js
+++ b/lib/roles/device/plugins/stats.js
@@ -4,7 +4,7 @@ var split = require('split')
 var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
diff --git a/lib/roles/device/plugins/touch.js b/lib/roles/device/plugins/touch.js
index aec3591b..5535f9e7 100644
--- a/lib/roles/device/plugins/touch.js
+++ b/lib/roles/device/plugins/touch.js
@@ -7,7 +7,7 @@ var wire = require('../../../wire')
 var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/router'))
   .dependency(require('../support/quit'))
diff --git a/lib/roles/device/resources/inputagent.js b/lib/roles/device/resources/inputagent.js
index 7e00f953..957907f0 100644
--- a/lib/roles/device/resources/inputagent.js
+++ b/lib/roles/device/resources/inputagent.js
@@ -8,7 +8,7 @@ var pathutil = require('../../../util/pathutil')
 var streamutil = require('../../../util/streamutil')
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .define(function(options, adb) {
     var log = logger.createLogger('device:resources:inputagent')
diff --git a/lib/roles/device/resources/remote.js b/lib/roles/device/resources/remote.js
index 904fdfb9..0deae3fb 100644
--- a/lib/roles/device/resources/remote.js
+++ b/lib/roles/device/resources/remote.js
@@ -8,7 +8,7 @@ var pathutil = require('../../../util/pathutil')
 var devutil = require('../../../util/devutil')
 var streamutil = require('../../../util/streamutil')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/properties'))
   .define(function(options, adb, properties) {
diff --git a/lib/roles/device/support/adb.js b/lib/roles/device/support/adb.js
index a15f7611..c11aff54 100644
--- a/lib/roles/device/support/adb.js
+++ b/lib/roles/device/support/adb.js
@@ -5,7 +5,7 @@ var adbkit = require('adbkit')
 var logger = require('../../../util/logger')
 var promiseutil = require('../../../util/promiseutil')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .define(function(options) {
     var log = logger.createLogger('device:support:adb')
     var adb = adbkit.createClient()
diff --git a/lib/roles/device/support/channels.js b/lib/roles/device/support/channels.js
index 648dee69..3c283ea3 100644
--- a/lib/roles/device/support/channels.js
+++ b/lib/roles/device/support/channels.js
@@ -3,7 +3,7 @@ var syrup = require('syrup')
 var logger = require('../../../util/logger')
 var ChannelManager = require('../../../wire/channelmanager')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .define(function(options, router) {
     var log = logger.createLogger('device:support:channels')
     var channels = new ChannelManager()
diff --git a/lib/roles/device/support/properties.js b/lib/roles/device/support/properties.js
index ce7309ab..54bbb240 100644
--- a/lib/roles/device/support/properties.js
+++ b/lib/roles/device/support/properties.js
@@ -3,7 +3,7 @@ var syrup = require('syrup')
 var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('./adb'))
   .define(function(options, adb) {
     var log = logger.createLogger('device:support:properties')
diff --git a/lib/roles/device/support/push.js b/lib/roles/device/support/push.js
index 699ed349..d5276af3 100644
--- a/lib/roles/device/support/push.js
+++ b/lib/roles/device/support/push.js
@@ -4,7 +4,7 @@ var zmq = require('zmq')
 
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .define(function(options) {
     var log = logger.createLogger('device:support:push')
 
diff --git a/lib/roles/device/support/quit.js b/lib/roles/device/support/quit.js
index e5606e55..61da55e8 100644
--- a/lib/roles/device/support/quit.js
+++ b/lib/roles/device/support/quit.js
@@ -3,7 +3,7 @@ var syrup = require('syrup')
 
 var logger = require('../../../util/logger')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .define(function(options) {
     var log = logger.createLogger('device:support:quit')
     var cleanup = []
diff --git a/lib/roles/device/support/router.js b/lib/roles/device/support/router.js
index 300919a0..2aeaf7d5 100644
--- a/lib/roles/device/support/router.js
+++ b/lib/roles/device/support/router.js
@@ -3,7 +3,7 @@ var syrup = require('syrup')
 var logger = require('../../../util/logger')
 var wirerouter = require('../../../wire/router')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('./sub'))
   .dependency(require('./channels'))
   .define(function(options, sub, channels) {
diff --git a/lib/roles/device/support/sub.js b/lib/roles/device/support/sub.js
index ef6bb11a..5677d1f7 100644
--- a/lib/roles/device/support/sub.js
+++ b/lib/roles/device/support/sub.js
@@ -5,7 +5,7 @@ var zmq = require('zmq')
 var logger = require('../../../util/logger')
 var wireutil = require('../../../wire/util')
 
-module.exports = syrup()
+module.exports = syrup.serial()
   .dependency(require('./channels'))
   .define(function(options, channels) {
     var log = logger.createLogger('device:support:sub')