diff --git a/backend-pg/package-lock.json b/backend-pg/package-lock.json
index b8813c363..e04228d44 100644
--- a/backend-pg/package-lock.json
+++ b/backend-pg/package-lock.json
@@ -78,6 +78,7 @@
         "@types/pg": "^8.10.9",
         "@types/picomatch": "^2.3.3",
         "@types/prompt-sync": "^4.2.3",
+        "@types/uuid": "^9.0.7",
         "@typescript-eslint/eslint-plugin": "^6.13.2",
         "@typescript-eslint/parser": "^6.13.2",
         "eslint": "^8.55.0",
@@ -3960,6 +3961,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/uuid": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
+      "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+      "dev": true
+    },
     "node_modules/@types/xml-crypto": {
       "version": "1.4.6",
       "resolved": "https://registry.npmjs.org/@types/xml-crypto/-/xml-crypto-1.4.6.tgz",
diff --git a/backend-pg/package.json b/backend-pg/package.json
index 02baa8cd3..b289749a2 100644
--- a/backend-pg/package.json
+++ b/backend-pg/package.json
@@ -44,6 +44,7 @@
     "@types/pg": "^8.10.9",
     "@types/picomatch": "^2.3.3",
     "@types/prompt-sync": "^4.2.3",
+    "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^6.13.2",
     "@typescript-eslint/parser": "^6.13.2",
     "eslint": "^8.55.0",
diff --git a/backend-pg/src/db/schemas/service-tokens.ts b/backend-pg/src/db/schemas/service-tokens.ts
index 29b0cd49f..c12e28432 100644
--- a/backend-pg/src/db/schemas/service-tokens.ts
+++ b/backend-pg/src/db/schemas/service-tokens.ts
@@ -8,7 +8,7 @@ import { z } from "zod";
 import { TImmutableDBKeys } from "./models";
 
 export const ServiceTokensSchema = z.object({
-  id: z.string().uuid(),
+  id: z.string(),
   name: z.string(),
   scopes: z.unknown(),
   permissions: z.string().array(),
diff --git a/backend-pg/src/ee/services/permission/project-permission.ts b/backend-pg/src/ee/services/permission/project-permission.ts
index 3459c73c7..f3fb67705 100644
--- a/backend-pg/src/ee/services/permission/project-permission.ts
+++ b/backend-pg/src/ee/services/permission/project-permission.ts
@@ -239,18 +239,17 @@ export const buildServiceTokenProjectPermission = (
   const { can, build } = new AbilityBuilder<MongoAbility<ProjectPermissionSet>>(createMongoAbility);
   scopes.forEach(({ secretPath, environment }) => {
     if (canWrite) {
-      can(ProjectPermissionActions.Edit, ProjectPermissionSub.Secrets, { secretPath, environment });
-      can(ProjectPermissionActions.Create, ProjectPermissionSub.Secrets, {
-        secretPath,
-        environment
-      });
-      can(ProjectPermissionActions.Delete, ProjectPermissionSub.Secrets, {
-        secretPath,
-        environment
-      });
+      // TODO: @Akhi 
+      // @ts-expect-error type 
+      can(ProjectPermissionActions.Edit, ProjectPermissionSub.Secrets, { secretPath: { $glob: secretPath }, environment });
+      // @ts-expect-error type 
+      can(ProjectPermissionActions.Create, ProjectPermissionSub.Secrets, { secretPath: { $glob: secretPath }, environment });
+      // @ts-expect-error type 
+      can(ProjectPermissionActions.Delete, ProjectPermissionSub.Secrets, {secretPath: { $glob: secretPath }, environment });
     }
     if (canRead) {
-      can(ProjectPermissionActions.Read, ProjectPermissionSub.Secrets, { secretPath, environment });
+      // @ts-expect-error type 
+      can(ProjectPermissionActions.Read, ProjectPermissionSub.Secrets, { secretPath: { $glob: secretPath }, environment });
     }
   });
 
diff --git a/backend-pg/src/services/secret/secret-dal.ts b/backend-pg/src/services/secret/secret-dal.ts
index 7031bb995..b80e8485a 100644
--- a/backend-pg/src/services/secret/secret-dal.ts
+++ b/backend-pg/src/services/secret/secret-dal.ts
@@ -4,6 +4,7 @@ import { TDbClient } from "@app/db";
 import { SecretsSchema, SecretType, TableName, TSecrets, TSecretsUpdate } from "@app/db/schemas";
 import { BadRequestError, DatabaseError } from "@app/lib/errors";
 import { ormify, selectAllTableCols, sqlNestRelationships } from "@app/lib/knex";
+import { validate as uuidValidate } from 'uuid';
 
 export type TSecretDALFactory = ReturnType<typeof secretDALFactory>;
 
@@ -79,6 +80,11 @@ export const secretDALFactory = (db: TDbClient) => {
 
   const findByFolderId = async (folderId: string, userId?: string, tx?: Knex) => {
     try {
+      // check if not uui then userId id is null (corner case because service token's ID is not UUI in effort to keep backwards compatibility from mongo)
+      if (userId && !uuidValidate(userId)) {
+        userId = undefined
+      }
+
       const secs = await (tx || db)(TableName.Secret)
         .where({ folderId })
         .where((bd) => {
diff --git a/pg-migrator/src/index.ts b/pg-migrator/src/index.ts
index f1115e9e7..1e17c5a82 100644
--- a/pg-migrator/src/index.ts
+++ b/pg-migrator/src/index.ts
@@ -1432,8 +1432,6 @@ const main = async () => {
       postgresTableName: TableName.ServiceToken,
       returnKeys: ["id"],
       preProcessing: async (doc) => {
-        const id = uuidV4();
-
         const projectKvRes = await projectKv
           .get(doc.workspace.toString())
           .catch(() => null);
@@ -1443,7 +1441,7 @@ const main = async () => {
         if (!userId) return;
 
         return {
-          id,
+          id: doc._id.toString(),
           projectId: doc.workspace.toString(),
           name: doc.name,
           createdBy: userId,