diff --git a/lib/middlewares/common.js b/lib/middlewares/common.js
index 4645b6d..debe156 100644
--- a/lib/middlewares/common.js
+++ b/lib/middlewares/common.js
@@ -1,4 +1,5 @@
-const uuidv1 = require('uuid/v1');
+// const uuidv1 = require('uuid/v1');
+const uniqid = require('uniqid');
 const logger = require('komodo-sdk/logger');
 
 module.exports = function common(req, res, next) {
@@ -7,7 +8,7 @@ module.exports = function common(req, res, next) {
         return;
     }
 
-    res.locals.xid = uuidv1();
+    res.locals.xid = uniqid();
     res.locals.x_http_request_ts = new Date();
 
     logger.info(`Got request from ${res.locals.httpgetx_subsystem === 'CORE-CALLBACK' ? 'CORE' : 'PARTNER'}`, {
diff --git a/package-lock.json b/package-lock.json
index 970eee4..5ec53c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3233,9 +3233,9 @@
       }
     },
     "uniqid": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.0.3.tgz",
-      "integrity": "sha512-R2qx3X/LYWSdGRaluio4dYrPXAJACTqyUjuyXHoJLBUOIfmMcnYOyY2d6Y4clZcIz5lK6ZaI0Zzmm0cPfsIqzQ=="
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.3.0.tgz",
+      "integrity": "sha512-Jq8EzvAT8/CcLu8tzoSiylnzPkNhJJKpnMT964Dj1jI4pG4sKYP9aFVByNTp8KzMvYlW1Um63PCDqtOoujNzrA=="
     },
     "unpipe": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 9b9045b..76c4665 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "komodo-sdk": "git+https://gitlab.kodesumber.com/komodo/komodo-sdk.git",
     "moment": "^2.24.0",
     "request": "^2.88.0",
-    "uniqid": "^5.0.3",
+    "uniqid": "^5.3.0",
     "uuid": "^3.3.3"
   }
 }