diff --git a/package-lock.json b/package-lock.json
index 65998e40..561d5dd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "8.6.0",
+  "version": "8.6.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1069,8 +1069,7 @@
     "bluebird": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz",
-      "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==",
-      "dev": true
+      "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg=="
     },
     "bluebird-lru-cache": {
       "version": "1.0.0",
@@ -1124,27 +1123,6 @@
         "type-is": "~1.6.16"
       }
     },
-    "bonjour": {
-      "version": "git+https://github.com/resin-io/bonjour.git#e018851dc823b4b3f670f658f71d0c1c7f3e637c",
-      "from": "git+https://github.com/resin-io/bonjour.git#fixed-mdns",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "git+https://github.com/resin-io-modules/multicast-dns.git#a15c63464eb43e8925b187ed5cb9de6892e8aacc",
-        "multicast-dns-service-types": "^1.1.0"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
-          "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
-          "dev": true
-        }
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1294,12 +1272,6 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -2185,12 +2157,6 @@
         }
       }
     },
-    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
-    },
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -2434,31 +2400,6 @@
         "path-type": "^3.0.0"
       }
     },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "dev": true,
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dev": true,
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
     "docker-delta": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-2.2.2.tgz",
@@ -3427,12 +3368,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3452,7 +3395,8 @@
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -3574,7 +3518,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3600,6 +3545,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4746,8 +4692,7 @@
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
     "ipaddr.js": {
       "version": "1.8.0",
@@ -4974,8 +4919,7 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -5905,8 +5849,7 @@
     "lodash": {
       "version": "4.17.11",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-      "dev": true
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -6368,8 +6311,9 @@
       }
     },
     "mixpanel": {
-      "version": "git+https://github.com/balena-io-modules/mixpanel-node.git#872ea6912de55c90783f3a22e9c6d226734c8a06",
-      "from": "git+https://github.com/balena-io-modules/mixpanel-node.git",
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/mixpanel/-/mixpanel-0.10.1.tgz",
+      "integrity": "sha512-jP2z5mxsewcHHtx5ZPrDf7U/ERPKyNTbpjGN5fdUPxDQk8C7+XoDO5SYZgBUtQ8SqEjZ+Yvw9lot3ec++EaYGA==",
       "dev": true,
       "requires": {
         "https-proxy-agent": "2.2.1"
@@ -6528,21 +6472,6 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "multicast-dns": {
-      "version": "git+https://github.com/resin-io-modules/multicast-dns.git#a15c63464eb43e8925b187ed5cb9de6892e8aacc",
-      "from": "git+https://github.com/resin-io-modules/multicast-dns.git#listen-on-all-interfaces",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^1.0.1",
-        "thunky": "^0.1.0"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-      "dev": true
-    },
     "mute-stream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
@@ -6718,15 +6647,6 @@
         "write-file-atomic": "^1.1.4"
       }
     },
-    "node-web-streams": {
-      "version": "github:resin-io-modules/node-web-streams#46f98300b69090bde3f6b4983877ccfe283a892c",
-      "from": "github:resin-io-modules/node-web-streams#emit-errors",
-      "dev": true,
-      "requires": {
-        "is-stream": "^1.1.0",
-        "web-streams-polyfill": "^1.3.2"
-      }
-    },
     "noop-logger": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
@@ -8259,17 +8179,6 @@
         "lodash": "^4.0.0"
       }
     },
-    "resin-discoverable-services": {
-      "version": "git+https://github.com/resin-io-modules/resin-discoverable-services.git#afca9e4700ec5ef82aa897f14bd5a46f06518061",
-      "from": "git+https://github.com/resin-io-modules/resin-discoverable-services.git#find-on-all-interfaces",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.0.0",
-        "bonjour": "git+https://github.com/resin-io/bonjour.git#e018851dc823b4b3f670f658f71d0c1c7f3e637c",
-        "ip": "^1.1.4",
-        "lodash": "^4.17.4"
-      }
-    },
     "resin-errors": {
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/resin-errors/-/resin-errors-2.13.0.tgz",
@@ -8374,11 +8283,20 @@
         "fetch-ponyfill": "^4.0.0",
         "fetch-readablestream": "^0.1.0",
         "lodash": "^4.6.1",
-        "node-web-streams": "github:resin-io-modules/node-web-streams#46f98300b69090bde3f6b4983877ccfe283a892c",
         "progress-stream": "^2.0.0",
         "qs": "^6.3.0",
         "resin-errors": "^2.7.0",
         "rindle": "^1.3.1"
+      },
+      "dependencies": {
+        "node-web-streams": {
+          "version": "github:resin-io-modules/node-web-streams#46f98300b69090bde3f6b4983877ccfe283a892c",
+          "from": "github:resin-io-modules/node-web-streams#46f98300b69090bde3f6b4983877ccfe283a892c",
+          "requires": {
+            "is-stream": "^1.1.0",
+            "web-streams-polyfill": "^1.3.2"
+          }
+        }
       }
     },
     "resin-sdk": {
@@ -8495,7 +8413,6 @@
         "lodash": "^4.13.1",
         "resin-cli-form": "^1.4.1",
         "resin-cli-visuals": "^1.2.8",
-        "resin-discoverable-services": "git+https://github.com/resin-io-modules/resin-discoverable-services.git#afca9e4700ec5ef82aa897f14bd5a46f06518061",
         "resin-sdk": "9.0.0-beta24",
         "resin-semver": "^1.3.0",
         "resin-settings-client": "^3.5.0",
@@ -8522,6 +8439,16 @@
             "semver": "^5.2.0",
             "tar-stream": "^1.5.2"
           }
+        },
+        "resin-discoverable-services": {
+          "version": "git+https://github.com/resin-io-modules/resin-discoverable-services.git#afca9e4700ec5ef82aa897f14bd5a46f06518061",
+          "from": "git+https://github.com/resin-io-modules/resin-discoverable-services.git#afca9e4700ec5ef82aa897f14bd5a46f06518061",
+          "requires": {
+            "bluebird": "^3.0.0",
+            "bonjour": "git+https://github.com/resin-io/bonjour.git#e018851dc823b4b3f670f658f71d0c1c7f3e637c",
+            "ip": "^1.1.4",
+            "lodash": "^4.17.4"
+          }
         }
       }
     },
@@ -10355,12 +10282,6 @@
       "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
       "dev": true
     },
-    "thunky": {
-      "version": "0.1.0",
-      "resolved": "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
-      "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=",
-      "dev": true
-    },
     "tildify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
@@ -11295,12 +11216,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "web-streams-polyfill": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-1.3.2.tgz",
-      "integrity": "sha1-NxkkXpCSgtk5Z4JfRLzVUOnAOZU=",
-      "dev": true
-    },
     "webpack": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
diff --git a/package.json b/package.json
index 9303f564..33dd297a 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "lodash": "^4.16.3",
     "log-timestamp": "^0.1.2",
     "memoizee": "^0.4.1",
-    "mixpanel": "https://github.com/balena-io-modules/mixpanel-node",
+    "mixpanel": "^0.10.1",
     "mkdirp": "^0.5.1",
     "mocha": "^5.1.1",
     "mochainon": "^2.0.0",