diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts
index 70c299564..872f38fec 100644
--- a/backend/src/ee/services/license/license-fns.ts
+++ b/backend/src/ee/services/license/license-fns.ts
@@ -17,11 +17,11 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   environmentsUsed: 0,
   identityLimit: null,
   identitiesUsed: 0,
-  dynamicSecret: false,
+  dynamicSecret: true,
   secretVersioning: true,
   pitRecovery: false,
   ipAllowlisting: false,
-  rbac: false,
+  rbac: true,
   customRateLimits: false,
   customAlerts: false,
   auditLogs: false,
diff --git a/frontend/src/context/ProjectPermissionContext/types.ts b/frontend/src/context/ProjectPermissionContext/types.ts
index 818a5d0e6..8f10d5f21 100644
--- a/frontend/src/context/ProjectPermissionContext/types.ts
+++ b/frontend/src/context/ProjectPermissionContext/types.ts
@@ -34,12 +34,12 @@ export enum PermissionConditionOperators {
 }
 
 export const formatedConditionsOperatorNames: { [K in PermissionConditionOperators]: string } = {
-  [PermissionConditionOperators.$EQ]: "equal",
-  [PermissionConditionOperators.$IN]: "containing",
+  [PermissionConditionOperators.$EQ]: "equal to",
+  [PermissionConditionOperators.$IN]: "contains",
   [PermissionConditionOperators.$ALL]: "contains all",
-  [PermissionConditionOperators.$NEQ]: "not equal",
-  [PermissionConditionOperators.$GLOB]: "glob matching",
-  [PermissionConditionOperators.$REGEX]: "regex"
+  [PermissionConditionOperators.$NEQ]: "not equal to",
+  [PermissionConditionOperators.$GLOB]: "matches glob pattern",
+  [PermissionConditionOperators.$REGEX]: "matches regex pattern"
 };
 
 export type TPermissionConditionOperators = {
diff --git a/frontend/src/reactQuery.tsx b/frontend/src/reactQuery.tsx
index 0ce8325b1..7b9735c9b 100644
--- a/frontend/src/reactQuery.tsx
+++ b/frontend/src/reactQuery.tsx
@@ -94,11 +94,13 @@ export const queryClient = new QueryClient({
                           >
                             <div>
                               {el.inverted ? "Cannot" : "Can"}{" "}
-                              <span className="text-primary-600">{el.action.toString()}</span>{" "}
-                              {el.subject.toString()} {hasConditions && "with conditions"}
+                              <span className="text-yellow-600">
+                                {el.action.toString().replaceAll(",", ", ")}
+                              </span>{" "}
+                              {el.subject.toString()} {hasConditions && "with conditions:"}
                             </div>
                             {hasConditions && (
-                              <div className="flex flex-col gap-1 pt-2 text-sm">
+                              <ul className="flex list-disc flex-col gap-1 pl-5 pt-2 text-sm">
                                 {Object.keys(el.conditions || {}).flatMap((field, fieldIndex) => {
                                   const operators = (
                                     el.conditions as Record<
@@ -111,38 +113,45 @@ export const queryClient = new QueryClient({
                                   const formattedFieldName = camelCaseToSpaces(field).toLowerCase();
                                   if (typeof operators === "string") {
                                     return (
-                                      <div
+                                      <li
                                         key={`Forbidden-error-details-${index + 1}-${
                                           fieldIndex + 1
                                         }`}
                                       >
-                                        {formattedFieldName} equal{" "}
-                                        <span className="text-primary-600">{operators}</span>
-                                      </div>
+                                        <span className="font-bold capitalize">
+                                          {formattedFieldName}
+                                        </span>{" "}
+                                        <span className="text-mineshaft-200">equal to</span>{" "}
+                                        <span className="text-yellow-600">{operators}</span>
+                                      </li>
                                     );
                                   }
 
                                   return Object.keys(operators).map((operator, operatorIndex) => (
-                                    <div
+                                    <li
                                       key={`Forbidden-error-details-${index + 1}-${
                                         fieldIndex + 1
                                       }-${operatorIndex + 1}`}
                                     >
-                                      <span className="capitalize">{formattedFieldName}</span>{" "}
-                                      {
-                                        formatedConditionsOperatorNames[
-                                          operator as PermissionConditionOperators
-                                        ]
-                                      }{" "}
-                                      <span className="text-primary-600">
+                                      <span className="font-bold capitalize">
+                                        {formattedFieldName}
+                                      </span>{" "}
+                                      <span className="text-mineshaft-200">
+                                        {
+                                          formatedConditionsOperatorNames[
+                                            operator as PermissionConditionOperators
+                                          ]
+                                        }
+                                      </span>{" "}
+                                      <span className="text-yellow-600">
                                         {operators[
                                           operator as PermissionConditionOperators
                                         ].toString()}
                                       </span>
-                                    </div>
+                                    </li>
                                   ));
                                 })}
-                              </div>
+                              </ul>
                             )}
                           </div>
                         );
diff --git a/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx b/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
index 06abc08e6..09a905b2d 100644
--- a/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
+++ b/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
@@ -154,7 +154,7 @@ export const CreateSecretForm = ({
               isMulti
               name="tagIds"
               isDisabled={!canReadTags}
-              isLoading={isTagsLoading}
+              isLoading={isTagsLoading && canReadTags}
               options={projectTags?.map((el) => ({ label: el.slug, value: el.id }))}
               value={field.value}
               onChange={field.onChange}
diff --git a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
index ec5b064c1..be9ee77ad 100644
--- a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
+++ b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
@@ -867,7 +867,7 @@ export const SecretOverviewPage = () => {
         <div className="thin-scrollbar mt-4">
           <TableContainer
             onScroll={(e) => setScrollOffset(e.currentTarget.scrollLeft)}
-            className="thin-scrollbar"
+            className="thin-scrollbar rounded-b-none"
           >
             <Table>
               <THead>
diff --git a/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx b/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx
index 0fd953a1f..91a6e766f 100644
--- a/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx
+++ b/frontend/src/views/SecretOverviewPage/components/CreateSecretForm/CreateSecretForm.tsx
@@ -255,7 +255,7 @@ export const CreateSecretForm = ({ secretPath = "/", getSecretByKey, onClose }:
               isMulti
               name="tagIds"
               isDisabled={!canReadTags}
-              isLoading={isTagsLoading}
+              isLoading={isTagsLoading && canReadTags}
               options={projectTags?.map((el) => ({ label: el.slug, value: el.id }))}
               value={field.value}
               onChange={field.onChange}