diff --git a/core/server/web/shared/middlewares/log-request.js b/core/server/web/shared/middlewares/log-request.js
index c536cd816a..f45bc521f5 100644
--- a/core/server/web/shared/middlewares/log-request.js
+++ b/core/server/web/shared/middlewares/log-request.js
@@ -7,7 +7,7 @@ const common = require('../../../lib/common');
  */
 module.exports = function logRequest(req, res, next) {
     const startTime = Date.now(),
-        requestId = req.get('X-Request-ID') || uuid.v1();
+        requestId = req.get('X-Request-ID') || uuid.v4();
 
     function logResponse() {
         res.responseTime = (Date.now() - startTime) + 'ms';
diff --git a/core/test/regression/api/v0.1/themes_spec.js b/core/test/regression/api/v0.1/themes_spec.js
index 7d4c191a9e..8a6e7ab01c 100644
--- a/core/test/regression/api/v0.1/themes_spec.js
+++ b/core/test/regression/api/v0.1/themes_spec.js
@@ -25,7 +25,7 @@ describe('Themes API', function () {
                 .attach(fieldName, themePath);
         },
         editor: null
-    }, ghostServer, contentFolder = path.join(os.tmpdir(), uuid.v1(), 'ghost-test');
+    }, ghostServer, contentFolder = path.join(os.tmpdir(), uuid.v4(), 'ghost-test');
 
     before(function () {
         return ghost()
diff --git a/core/test/regression/api/v2/admin/db_spec.js b/core/test/regression/api/v2/admin/db_spec.js
index 1addd89f88..0b68fc1ed6 100644
--- a/core/test/regression/api/v2/admin/db_spec.js
+++ b/core/test/regression/api/v2/admin/db_spec.js
@@ -68,7 +68,7 @@ describe('DB API', () => {
     });
 
     it('can export & import', () => {
-        const exportFolder = path.join(os.tmpdir(), uuid.v1());
+        const exportFolder = path.join(os.tmpdir(), uuid.v4());
         const exportPath = path.join(exportFolder, 'export.json');
 
         return request.put(localUtils.API.getApiQuery('settings/'))
diff --git a/core/test/utils/index.js b/core/test/utils/index.js
index 1fbe7e538d..2603d8240d 100644
--- a/core/test/utils/index.js
+++ b/core/test/utils/index.js
@@ -851,7 +851,7 @@ startGhost = function startGhost(options) {
         forceStart: false,
         copyThemes: true,
         copySettings: true,
-        contentFolder: path.join(os.tmpdir(), uuid.v1(), 'ghost-test'),
+        contentFolder: path.join(os.tmpdir(), uuid.v4(), 'ghost-test'),
         subdir: false
     }, options);