diff --git a/src/addons.js b/src/addons.js
index 08aecb4ec..886541cb4 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -23,7 +23,7 @@ var appdb = require('./appdb.js'),
     config = require('./config.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:addons'),
-    docker = require('./docker.js'),
+    docker = require('./docker.js').connection,
     fs = require('fs'),
     generatePassword = require('password-generator'),
     hat = require('hat'),
diff --git a/src/apphealthmonitor.js b/src/apphealthmonitor.js
index 4494a8e8c..e5dfdf80f 100644
--- a/src/apphealthmonitor.js
+++ b/src/apphealthmonitor.js
@@ -5,7 +5,7 @@ var appdb = require('./appdb.js'),
     async = require('async'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apphealthmonitor'),
-    docker = require('./docker.js'),
+    docker = require('./docker.js').connection,
     mailer = require('./mailer.js'),
     superagent = require('superagent'),
     util = require('util');
diff --git a/src/apps.js b/src/apps.js
index a7fd45f39..932721e32 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -53,7 +53,7 @@ var addons = require('./addons.js'),
     constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apps'),
-    docker = require('./docker.js'),
+    docker = require('./docker.js').connection,
     fs = require('fs'),
     manifestFormat = require('cloudron-manifestformat'),
     path = require('path'),
diff --git a/src/apptask.js b/src/apptask.js
index fbb55e433..638cd9ba3 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -41,7 +41,7 @@ var addons = require('./addons.js'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apptask'),
-    docker = require('./docker.js'),
+    docker = require('./docker.js').connection,
     ejs = require('ejs'),
     fs = require('fs'),
     hat = require('hat'),
diff --git a/src/docker.js b/src/docker.js
index 0bbfe1c12..fe8fd14c2 100644
--- a/src/docker.js
+++ b/src/docker.js
@@ -2,9 +2,9 @@
 
 var Docker = require('dockerode');
 
-var gConnection = connectionInstance();
-
-exports = module.exports = gConnection;
+exports = module.exports = {
+    connection: connectionInstance()
+};
 
 function connectionInstance() {
     var docker;
diff --git a/src/janitor.js b/src/janitor.js
index 2f0ca9994..46212656a 100644
--- a/src/janitor.js
+++ b/src/janitor.js
@@ -4,7 +4,7 @@ var assert = require('assert'),
     async = require('async'),
     authcodedb = require('./authcodedb.js'),
     debug = require('debug')('box:src/janitor'),
-    docker = require('./docker.js'),
+    docker = require('./docker.js').connection,
     tokendb = require('./tokendb.js');
 
 exports = module.exports = {
diff --git a/src/mailer.js b/src/mailer.js
index 23280f942..bcfe378cc 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -28,7 +28,7 @@ var assert = require('assert'),
     config = require('./config.js'),
     debug = require('debug')('box:mailer'),
     digitalocean = require('./digitalocean.js'),
-    docker = require('./docker.js'),
+    docker = require('./docker.js').connection,
     ejs = require('ejs'),
     nodemailer = require('nodemailer'),
     path = require('path'),
diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js
index 79745c5e5..fde2df397 100644
--- a/src/routes/test/apps-test.js
+++ b/src/routes/test/apps-test.js
@@ -16,7 +16,7 @@ var appdb = require('../../appdb.js'),
     config = require('../../config.js'),
     constants = require('../../constants.js'),
     database = require('../../database.js'),
-    docker = require('../../docker.js'),
+    docker = require('../../docker.js').connection,
     expect = require('expect.js'),
     fs = require('fs'),
     hock = require('hock'),
@@ -25,7 +25,6 @@ var appdb = require('../../appdb.js'),
     js2xml = require('js2xmlparser'),
     net = require('net'),
     nock = require('nock'),
-    os = require('os'),
     paths = require('../../paths.js'),
     redis = require('redis'),
     request = require('superagent'),