diff --git a/docker-compose.yml b/docker-compose.yml
index c7a491d49..59573b1b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,9 +88,9 @@ services:
         ports:
             - "80:80"
         links:
-            - "auth:${BRANCH_NAME}-auth"
-            - "salix:${BRANCH_NAME}-salix"
-            - "client:${BRANCH_NAME}-client"
-            - "mailer:${BRANCH_NAME}-mailer"
-            - "production:${BRANCH_NAME}-production"
-            - "route:${BRANCH_NAME}-route"
+            - "${BRANCH_NAME}-auth:auth"
+            - "${BRANCH_NAME}-salix:salix"
+            - "${BRANCH_NAME}-client:client"
+            - "${BRANCH_NAME}-mailer:mailer"
+            - "${BRANCH_NAME}-production:production"
+            - "${BRANCH_NAME}-route:route"
diff --git a/services/loopback/server/server.js b/services/loopback/server/server.js
index b11c17c58..55ff51e36 100644
--- a/services/loopback/server/server.js
+++ b/services/loopback/server/server.js
@@ -84,10 +84,11 @@ function vnBoot(app, rootDir, cb) {
 
     boot(app, bootOptions, function(err) {
         if (err) throw err;
-        if (require.main === module)
-            app.start();
-
         if (cb)
             cb(app);
     });
+
+    if (require.main === module) {
+        app.start();
+    }
 }