diff --git a/backend/src/validation/integration.ts b/backend/src/validation/integration.ts
index e1b47b6d5..db8b0ee8b 100644
--- a/backend/src/validation/integration.ts
+++ b/backend/src/validation/integration.ts
@@ -102,7 +102,7 @@ export const DeleteIntegrationV1 = z.object({
 
 export const ManualSyncV1 = z.object({
   body: z.object({
-    environment: z.string(),
-    workspaceId: z.string()
+    environment: z.string().trim(),
+    workspaceId: z.string().trim()
   })
 });
diff --git a/backend/src/validation/role.ts b/backend/src/validation/role.ts
index 61252a39d..efc659a23 100644
--- a/backend/src/validation/role.ts
+++ b/backend/src/validation/role.ts
@@ -2,16 +2,16 @@ import { z } from "zod";
 
 export const CreateRoleSchema = z.object({
   body: z.object({
-    slug: z.string(),
-    name: z.string(),
-    description: z.string().optional(),
-    workspaceId: z.string().optional(),
-    orgId: z.string(),
+    slug: z.string().trim(),
+    name: z.string().trim(),
+    description: z.string().trim().optional(),
+    workspaceId: z.string().trim().optional(),
+    orgId: z.string().trim(),
     permissions: z
       .object({
-        subject: z.string(),
-        action: z.string(),
-        conditions: z.record(z.union([z.string(), z.number()])).optional()
+        subject: z.string().trim(),
+        action: z.string().trim(),
+        conditions: z.record(z.union([z.string().trim(), z.number()])).optional()
       })
       .array()
   })
@@ -19,19 +19,19 @@ export const CreateRoleSchema = z.object({
 
 export const UpdateRoleSchema = z.object({
   params: z.object({
-    id: z.string()
+    id: z.string().trim()
   }),
   body: z.object({
-    slug: z.string().optional(),
-    name: z.string().optional(),
-    description: z.string().optional(),
-    workspaceId: z.string().optional(),
-    orgId: z.string(),
+    slug: z.string().trim().optional(),
+    name: z.string().trim().optional(),
+    description: z.string().trim().optional(),
+    workspaceId: z.string().trim().optional(),
+    orgId: z.string().trim(),
     permissions: z
       .object({
-        subject: z.string(),
-        action: z.string(),
-        conditions: z.record(z.union([z.string(), z.number()])).optional()
+        subject: z.string().trim(),
+        action: z.string().trim(),
+        conditions: z.record(z.union([z.string().trim(), z.number()])).optional()
       })
       .array()
       .optional()
diff --git a/backend/src/validation/secrets.ts b/backend/src/validation/secrets.ts
index c4529039b..afa77cbf0 100644
--- a/backend/src/validation/secrets.ts
+++ b/backend/src/validation/secrets.ts
@@ -328,9 +328,7 @@ export const CreateSecretV3 = z.object({
     secretCommentCiphertext: z.string().trim().optional(),
     secretCommentIV: z.string().trim().optional(),
     secretCommentTag: z.string().trim().optional(),
-    metadata: z.object({
-      source: z.string()
-    })
+    metadata: z.record(z.string()).optional(),
   }),
   params: z.object({
     secretName: z.string().trim()
diff --git a/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.utils.ts b/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.utils.ts
index 05e29e96d..d121d4538 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.utils.ts
+++ b/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.utils.ts
@@ -13,9 +13,9 @@ const generalPermissionSchema = z
   .optional();
 
 export const formSchema = z.object({
-  name: z.string(),
-  description: z.string().optional(),
-  slug: z.string(),
+  name: z.string().trim(),
+  description: z.string().trim().optional(),
+  slug: z.string().trim(),
   permissions: z.object({
     workspace: z
       .object({
diff --git a/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.utils.ts b/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.utils.ts
index 9ec0e6469..55ad78bb8 100644
--- a/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.utils.ts
+++ b/frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.utils.ts
@@ -14,7 +14,7 @@ const generalPermissionSchema = z
 
 const multiEnvPermissionSchema = z
   .object({
-    secretPath: z.string().optional(),
+    secretPath: z.string().trim().optional(),
     read: z.boolean().optional(),
     edit: z.boolean().optional(),
     delete: z.boolean().optional(),
@@ -26,9 +26,9 @@ const PERMISSION_ACTIONS = ["read", "create", "edit", "delete"] as const;
 const MULTI_ENV_KEY = ["secrets", "folders", "secret-imports"] as const;
 
 export const formSchema = z.object({
-  name: z.string(),
-  description: z.string().optional(),
-  slug: z.string(),
+  name: z.string().trim(),
+  description: z.string().trim().optional(),
+  slug: z.string().trim(),
   permissions: z.object({
     secrets: z.record(multiEnvPermissionSchema).optional(),
     folders: z.record(multiEnvPermissionSchema).optional(),