diff --git a/lib/units/api/controllers/user.js b/lib/units/api/controllers/user.js
index 6cfb5fa2..0839f869 100644
--- a/lib/units/api/controllers/user.js
+++ b/lib/units/api/controllers/user.js
@@ -2,7 +2,7 @@ var util = require('util')
 
 var _ = require('lodash')
 var Promise = require('bluebird')
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 
 var dbapi = require('../../../db/api')
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/screen/stream.js b/lib/units/device/plugins/screen/stream.js
index f2e46150..bd757201 100644
--- a/lib/units/device/plugins/screen/stream.js
+++ b/lib/units/device/plugins/screen/stream.js
@@ -3,7 +3,7 @@ var util = require('util')
 var Promise = require('bluebird')
 var syrup = require('stf-syrup')
 var WebSocket = require('ws')
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 var EventEmitter = require('eventemitter3')
 var split = require('split')
 var adbkit = require('adbkit')
diff --git a/lib/units/device/plugins/vnc/index.js b/lib/units/device/plugins/vnc/index.js
index e6a6fd25..fabb268e 100644
--- a/lib/units/device/plugins/vnc/index.js
+++ b/lib/units/device/plugins/vnc/index.js
@@ -4,7 +4,7 @@ var os = require('os')
 
 var syrup = require('stf-syrup')
 var Promise = require('bluebird')
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 var jpeg = require('jpeg-turbo')
 
 var logger = require('../../../../util/logger')
diff --git a/lib/units/storage/s3.js b/lib/units/storage/s3.js
index f690494d..e44bafff 100644
--- a/lib/units/storage/s3.js
+++ b/lib/units/storage/s3.js
@@ -8,7 +8,7 @@ var validator = require('express-validator')
 var bodyParser = require('body-parser')
 var formidable = require('formidable')
 var Promise = require('bluebird')
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 var AWS = require('aws-sdk')
 
 var logger = require('../../util/logger')
diff --git a/lib/units/websocket/index.js b/lib/units/websocket/index.js
index a04e3882..86cba87b 100644
--- a/lib/units/websocket/index.js
+++ b/lib/units/websocket/index.js
@@ -7,7 +7,7 @@ var Promise = require('bluebird')
 var _ = require('lodash')
 var request = Promise.promisifyAll(require('request'))
 var adbkit = require('adbkit')
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 
 var logger = require('../../util/logger')
 var wire = require('../../wire')
diff --git a/lib/util/fakedevice.js b/lib/util/fakedevice.js
index 7c6f9b5c..7ec96f8d 100644
--- a/lib/util/fakedevice.js
+++ b/lib/util/fakedevice.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 var _ = require('lodash')
 
 var dbapi = require('../db/api')
diff --git a/lib/util/storage.js b/lib/util/storage.js
index 05cabc14..3f0cd419 100644
--- a/lib/util/storage.js
+++ b/lib/util/storage.js
@@ -2,7 +2,7 @@ var events = require('events')
 var util = require('util')
 var fs = require('fs')
 
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 
 function Storage() {
   events.EventEmitter.call(this)
diff --git a/lib/wire/util.js b/lib/wire/util.js
index 5ebffc35..339c8b8d 100644
--- a/lib/wire/util.js
+++ b/lib/wire/util.js
@@ -1,4 +1,4 @@
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 
 var wire = require('./')
 
diff --git a/package.json b/package.json
index 1a0af326..d2309dbf 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
     "minicap-prebuilt": "^1.2.0",
     "minimatch": "^3.0.3",
     "my-local-ip": "^1.0.0",
-    "node-uuid": "^1.4.3",
     "openid": "^2.0.1",
     "passport": "^0.3.2",
     "passport-oauth2": "^1.1.2",
@@ -89,6 +88,7 @@
     "transliteration": "^1.1.6",
     "url-join": "1.1.0",
     "utf-8-validate": "^1.2.1",
+    "uuid": "^3.0.0",
     "ws": "^1.0.1",
     "zmq": "^2.14.0"
   },
diff --git a/res/app/components/stf/transaction/transaction-service.js b/res/app/components/stf/transaction/transaction-service.js
index fc1454df..4c2d3e90 100644
--- a/res/app/components/stf/transaction/transaction-service.js
+++ b/res/app/components/stf/transaction/transaction-service.js
@@ -1,5 +1,5 @@
 var Promise = require('bluebird')
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 
 module.exports = function TransactionServiceFactory(socket, TransactionError) {
   var transactionService = {}
diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js b/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js
index 21fb5904..0ece63fa 100644
--- a/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js
+++ b/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js
@@ -1,4 +1,4 @@
-var uuid = require('node-uuid')
+var uuid = require('uuid')
 var Promise = require('bluebird')
 
 module.exports = function PortForwardingCtrl(