diff --git a/backend/src/ee/services/permission/permission-types.ts b/backend/src/ee/services/permission/permission-types.ts
index 7b1f1a5df..60fcbec85 100644
--- a/backend/src/ee/services/permission/permission-types.ts
+++ b/backend/src/ee/services/permission/permission-types.ts
@@ -11,31 +11,37 @@ export enum PermissionConditionOperators {
 }
 
 export const PermissionConditionSchema = {
-  [PermissionConditionOperators.$IN]: z.string().array(),
-  [PermissionConditionOperators.$ALL]: z.string().array(),
-  [PermissionConditionOperators.$REGEX]: z.string().refine(
-    (el) => {
-      try {
-        // eslint-disable-next-line no-new
-        new RegExp(el);
-        return true;
-      } catch {
-        return false;
-      }
-    },
-    { message: "Invalid regex pattern" }
-  ),
-  [PermissionConditionOperators.$EQ]: z.string(),
-  [PermissionConditionOperators.$NEQ]: z.string(),
-  [PermissionConditionOperators.$GLOB]: z.string().refine(
-    (el) => {
-      try {
-        picomatch.parse([el]);
-        return true;
-      } catch {
-        return false;
-      }
-    },
-    { message: "Invalid glob pattern" }
-  )
+  [PermissionConditionOperators.$IN]: z.string().min(1).array(),
+  [PermissionConditionOperators.$ALL]: z.string().min(1).array(),
+  [PermissionConditionOperators.$REGEX]: z
+    .string()
+    .min(1)
+    .refine(
+      (el) => {
+        try {
+          // eslint-disable-next-line no-new
+          new RegExp(el);
+          return true;
+        } catch {
+          return false;
+        }
+      },
+      { message: "Invalid regex pattern" }
+    ),
+  [PermissionConditionOperators.$EQ]: z.string().min(1),
+  [PermissionConditionOperators.$NEQ]: z.string().min(1),
+  [PermissionConditionOperators.$GLOB]: z
+    .string()
+    .min(1)
+    .refine(
+      (el) => {
+        try {
+          picomatch.parse([el]);
+          return true;
+        } catch {
+          return false;
+        }
+      },
+      { message: "Invalid glob pattern" }
+    )
 };
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/PermissionEmptyState.tsx b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/PermissionEmptyState.tsx
new file mode 100644
index 000000000..9a1bdab49
--- /dev/null
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/PermissionEmptyState.tsx
@@ -0,0 +1,18 @@
+import { useFormContext } from "react-hook-form";
+
+import { EmptyState } from "@app/components/v2";
+
+import { TFormSchema } from "./ProjectRoleModifySection.utils";
+
+// This is made into seperate component because watch subscribes to all permissions
+// thus keeping in top level casues render on all ones
+export const PermissionEmptyState = () => {
+  const { watch } = useFormContext<TFormSchema>();
+  const isNotEmptyPermissions = Object.entries(watch("permissions") || {}).some(
+    ([key, value]) => key && value?.length > 0
+  );
+
+  if (isNotEmptyPermissions) return <div />;
+
+  return <EmptyState title="No policies applied" className="py-8" />;
+};
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
index 94a118058..9a4a6cff8 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
@@ -32,7 +32,7 @@ const WorkspacePolicyActionSchema = z.object({
 const ConditionSchema = z.object({
   operator: z.string(),
   lhs: z.string(),
-  rhs: z.string()
+  rhs: z.string().min(1)
 });
 
 export const formSchema = z.object({
@@ -46,7 +46,23 @@ export const formSchema = z.object({
   permissions: z
     .object({
       [ProjectPermissionSub.Secrets]: GeneralPolicyActionSchema.extend({
-        conditions: ConditionSchema.array().optional().default([])
+        conditions: ConditionSchema.array()
+          .optional()
+          .default([])
+          .refine(
+            (el) => {
+              const lhsOperatorSet = new Set<string>();
+              for (let i = 0; i < el.length; i += 1) {
+                const { lhs, operator } = el[i];
+                if (lhsOperatorSet.has(`${lhs}-${operator}`)) {
+                  return false;
+                }
+                lhsOperatorSet.add(`${lhs}-${operator}`);
+              }
+              return true;
+            },
+            { message: "Duplicate operator found for a condition" }
+          )
       })
         .array()
         .default([]),
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/RolePermissionsSection.tsx b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/RolePermissionsSection.tsx
index a9d843530..d906a19fa 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/RolePermissionsSection.tsx
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/RolePermissionsSection.tsx
@@ -1,10 +1,10 @@
 import { FormProvider, useForm } from "react-hook-form";
-import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faCancel, faPlus, faSave } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
 
 import { createNotification } from "@app/components/notifications";
-import { Button, EmptyState, Modal, ModalContent, ModalTrigger } from "@app/components/v2";
+import { Button, Modal, ModalContent, ModalTrigger, Spinner } from "@app/components/v2";
 import { ProjectPermissionSub, useWorkspace } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useGetProjectRoleBySlug, useUpdateProjectRole } from "@app/hooks/api";
@@ -12,6 +12,7 @@ import { useGetProjectRoleBySlug, useUpdateProjectRole } from "@app/hooks/api";
 import { GeneralPermissionOptions } from "./components/GeneralPermissionOptions";
 import { NewPermissionRule } from "./components/NewPermissionRule";
 import { SecretPermissionConditions } from "./components/SecretPermissionConditions";
+import { PermissionEmptyState } from "./PermissionEmptyState";
 import {
   formRolePermission2API,
   formSchema,
@@ -38,6 +39,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
     values: role ? { ...role, permissions: rolePermission2Form(role.permissions) } : undefined,
     resolver: zodResolver(formSchema)
   });
+
   const {
     handleSubmit,
     formState: { isDirty, isSubmitting },
@@ -81,6 +83,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
                   type="submit"
                   isDisabled={isSubmitting || !isDirty}
                   isLoading={isSubmitting}
+                  leftIcon={<FontAwesomeIcon icon={faSave} />}
                 >
                   Save
                 </Button>
@@ -90,6 +93,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
                   isDisabled={isSubmitting || !isDirty}
                   isLoading={isSubmitting}
                   onClick={() => reset()}
+                  leftIcon={<FontAwesomeIcon icon={faCancel} />}
                 >
                   Cancel
                 </Button>
@@ -97,35 +101,44 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
             )}
           </div>
         </div>
-        <div className="py-4">
-          {!isLoading && !role?.permissions?.length && <EmptyState title="No policies applied" />}
-          {(Object.keys(PROJECT_PERMISSION_OBJECT) as ProjectPermissionSub[]).map((subject) => (
-            <GeneralPermissionOptions
-              subject={subject}
-              actions={PROJECT_PERMISSION_OBJECT[subject].actions}
-              title={PROJECT_PERMISSION_OBJECT[subject].title}
-              key={`project-permission-${subject}`}
-              isDisabled={isDisabled}
+        {isSubmitting ? (
+          <div className="flex items-center justify-center space-x-4 pt-16">
+            <Spinner size="lg" />
+            <p className="text-sm text-gray-400">Saving your policy.</p>
+          </div>
+        ) : (
+          <>
+            <div className="py-4">
+              {!isLoading && <PermissionEmptyState />}
+              {(Object.keys(PROJECT_PERMISSION_OBJECT) as ProjectPermissionSub[]).map((subject) => (
+                <GeneralPermissionOptions
+                  subject={subject}
+                  actions={PROJECT_PERMISSION_OBJECT[subject].actions}
+                  title={PROJECT_PERMISSION_OBJECT[subject].title}
+                  key={`project-permission-${subject}`}
+                  isDisabled={isDisabled}
+                >
+                  {subject === ProjectPermissionSub.Secrets ? (
+                    <SecretPermissionConditions isDisabled={isDisabled} />
+                  ) : undefined}
+                </GeneralPermissionOptions>
+              ))}
+            </div>
+            <Modal
+              isOpen={popUp.createPolicy.isOpen}
+              onOpenChange={(isOpen) => handlePopUpToggle("createPolicy", isOpen)}
             >
-              {subject === ProjectPermissionSub.Secrets ? (
-                <SecretPermissionConditions isDisabled={isDisabled} />
-              ) : undefined}
-            </GeneralPermissionOptions>
-          ))}
-        </div>
-        <Modal
-          isOpen={popUp.createPolicy.isOpen}
-          onOpenChange={(isOpen) => handlePopUpToggle("createPolicy", isOpen)}
-        >
-          <ModalTrigger asChild disabled={isDisabled}>
-            <Button isDisabled={isDisabled} leftIcon={<FontAwesomeIcon icon={faPlus} />}>
-              Add Policy
-            </Button>
-          </ModalTrigger>
-          <ModalContent title="New Policy" subTitle="Policies grant additional permissions.">
-            <NewPermissionRule onClose={() => handlePopUpToggle("createPolicy")} />
-          </ModalContent>
-        </Modal>
+              <ModalTrigger asChild disabled={isDisabled}>
+                <Button isDisabled={isDisabled} leftIcon={<FontAwesomeIcon icon={faPlus} />}>
+                  Add Policy
+                </Button>
+              </ModalTrigger>
+              <ModalContent title="New Policy" subTitle="Policies grant additional permissions.">
+                <NewPermissionRule onClose={() => handlePopUpToggle("createPolicy")} />
+              </ModalContent>
+            </Modal>
+          </>
+        )}
       </FormProvider>
     </form>
   );
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/GeneralPermissionOptions.tsx b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/GeneralPermissionOptions.tsx
index 5e9220458..3dc4dcb86 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/GeneralPermissionOptions.tsx
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/GeneralPermissionOptions.tsx
@@ -125,7 +125,7 @@ export const GeneralPermissionOptions = <T extends keyof NonNullable<TFormSchema
                         }}
                         isDisabled={isDisabled}
                       >
-                        Add rule
+                        Add policy
                       </Button>
                     )}
                     {!isDisabled && (
@@ -137,7 +137,7 @@ export const GeneralPermissionOptions = <T extends keyof NonNullable<TFormSchema
                         onClick={() => items.remove(rootIndex)}
                         isDisabled={isDisabled}
                       >
-                        Remove Rule
+                        Remove policy
                       </Button>
                     )}{" "}
                   </div>
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
index c58e96331..54b1c49af 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
@@ -1,6 +1,7 @@
 import { Controller, useFieldArray, useFormContext } from "react-hook-form";
-import { faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faPlus, faTrash, faWarning } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
 
 import { Button, FormControl, IconButton, Input, Select, SelectItem } from "@app/components/v2";
 import { PermissionConditionOperators } from "@app/context/ProjectPermissionContext/types";
@@ -19,14 +20,23 @@ const getValueLabel = (type: string) => {
 };
 
 export const SecretPermissionConditions = ({ position = 0, isDisabled }: Props) => {
-  const { control, watch } = useFormContext<TFormSchema>();
+  const {
+    control,
+    watch,
+    formState: { errors }
+  } = useFormContext<TFormSchema>();
   const items = useFieldArray({
     control,
     name: `permissions.secrets.${position}.conditions`
   });
 
   return (
-    <div className="mt-6 border-t border-t-gray-800 bg-mineshaft-800 pt-2">
+    <div
+      className={twMerge(
+        "mt-6 bg-mineshaft-800",
+        items.fields.length && " border-t border-t-gray-800  pt-2"
+      )}
+    >
       <div className="mt-2 flex flex-col space-y-2">
         {items.fields.map((el, index) => {
           const lhs = watch(`permissions.secrets.${position}.conditions.${index}.lhs`);
@@ -51,7 +61,7 @@ export const SecretPermissionConditions = ({ position = 0, isDisabled }: Props)
                         onValueChange={(e) => field.onChange(e)}
                         className="w-full"
                       >
-                        <SelectItem value="environment">Environment</SelectItem>
+                        <SelectItem value="environment">Environment Slug</SelectItem>
                         <SelectItem value="secretPath">Secret Path</SelectItem>
                       </Select>
                     </FormControl>
@@ -114,6 +124,13 @@ export const SecretPermissionConditions = ({ position = 0, isDisabled }: Props)
           );
         })}
       </div>
+      {errors?.permissions?.secrets?.[position]?.conditions?.message && (
+        <div className="flex items-center space-x-2 py-2 text-sm text-gray-400">
+          <FontAwesomeIcon icon={faWarning} className="text-red" />
+          <span>{errors?.permissions?.secrets?.[position]?.conditions?.message}</span>
+        </div>
+      )}
+      <div>{}</div>
       <div>
         <Button
           leftIcon={<FontAwesomeIcon icon={faPlus} />}