diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx
index 6530c890a..ca5eb9659 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx
@@ -597,8 +597,8 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
                     >
                       <div className="space-y-2">
                         {value.map((san, index) => (
-                          // eslint-disable-next-line react/no-array-index-key
                           <div
+                            // eslint-disable-next-line react/no-array-index-key
                             key={`subject-alt-name-${index}`}
                             className="flex items-center gap-2"
                           >
@@ -746,80 +746,80 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
                   <AccordionItem value="key-usages">
                     <AccordionTrigger>Key Usages</AccordionTrigger>
                     <AccordionContent>
-                        <div className="grid grid-cols-2 gap-2 pl-2">
-                          {filteredKeyUsages.map(({ label, value }) => {
-                            const isRequired = requiredKeyUsages.includes(value);
-                            return (
-                              <Controller
-                                key={label}
-                                control={control}
-                                name={`keyUsages.${value}` as any}
-                                render={({ field }) => (
-                                  <div className="flex items-center space-x-3">
-                                    <Checkbox
-                                      id={`key-usage-${value}`}
-                                      isChecked={field.value || false}
-                                      onCheckedChange={(checked) => {
+                      <div className="grid grid-cols-2 gap-2 pl-2">
+                        {filteredKeyUsages.map(({ label, value }) => {
+                          const isRequired = requiredKeyUsages.includes(value);
+                          return (
+                            <Controller
+                              key={label}
+                              control={control}
+                              name={`keyUsages.${value}` as any}
+                              render={({ field }) => (
+                                <div className="flex items-center space-x-3">
+                                  <Checkbox
+                                    id={`key-usage-${value}`}
+                                    isChecked={field.value || false}
+                                    onCheckedChange={(checked) => {
                                       if (!isRequired) {
-                                          field.onChange(checked);
-                                        }
-                                      }}
+                                        field.onChange(checked);
+                                      }
+                                    }}
                                     isDisabled={isRequired}
+                                  />
+                                  <div className="flex items-center gap-2">
+                                    <FormLabel
+                                      id={`key-usage-${value}`}
+                                      className={`text-sm ${isRequired ? "text-mineshaft-200" : "cursor-pointer text-mineshaft-300"}`}
+                                      label={label}
                                     />
-                                    <div className="flex items-center gap-2">
-                                      <FormLabel
-                                        id={`key-usage-${value}`}
-                                        className={`text-sm ${isRequired ? "text-mineshaft-200" : "cursor-pointer text-mineshaft-300"}`}
-                                        label={label}
-                                      />
-                                      {isRequired && <span className="text-xs">(Required)</span>}
-                                    </div>
+                                    {isRequired && <span className="text-xs">(Required)</span>}
                                   </div>
-                                )}
-                              />
-                            );
-                          })}
-                        </div>
+                                </div>
+                              )}
+                            />
+                          );
+                        })}
+                      </div>
                     </AccordionContent>
                   </AccordionItem>
 
                   <AccordionItem value="extended-key-usages">
                     <AccordionTrigger>Extended Key Usages</AccordionTrigger>
                     <AccordionContent>
-                        <div className="grid grid-cols-2 gap-2 pl-2">
-                          {filteredExtendedKeyUsages.map(({ label, value }) => {
-                            const isRequired = requiredExtendedKeyUsages.includes(value);
-                            return (
-                              <Controller
-                                key={label}
-                                control={control}
-                                name={`extendedKeyUsages.${value}` as any}
-                                render={({ field }) => (
-                                  <div className="flex items-center space-x-3">
-                                    <Checkbox
-                                      id={`ext-key-usage-${value}`}
-                                      isChecked={field.value || false}
-                                      onCheckedChange={(checked) => {
+                      <div className="grid grid-cols-2 gap-2 pl-2">
+                        {filteredExtendedKeyUsages.map(({ label, value }) => {
+                          const isRequired = requiredExtendedKeyUsages.includes(value);
+                          return (
+                            <Controller
+                              key={label}
+                              control={control}
+                              name={`extendedKeyUsages.${value}` as any}
+                              render={({ field }) => (
+                                <div className="flex items-center space-x-3">
+                                  <Checkbox
+                                    id={`ext-key-usage-${value}`}
+                                    isChecked={field.value || false}
+                                    onCheckedChange={(checked) => {
                                       if (!isRequired) {
-                                          field.onChange(checked);
-                                        }
-                                      }}
+                                        field.onChange(checked);
+                                      }
+                                    }}
                                     isDisabled={isRequired}
+                                  />
+                                  <div className="flex items-center gap-2">
+                                    <FormLabel
+                                      id={`ext-key-usage-${value}`}
+                                      className={`text-sm ${isRequired ? "text-mineshaft-200" : "cursor-pointer text-mineshaft-300"}`}
+                                      label={label}
                                     />
-                                    <div className="flex items-center gap-2">
-                                      <FormLabel
-                                        id={`ext-key-usage-${value}`}
-                                        className={`text-sm ${isRequired ? "text-mineshaft-200" : "cursor-pointer text-mineshaft-300"}`}
-                                        label={label}
-                                      />
-                                      {isRequired && <span className="text-xs">(Required)</span>}
-                                    </div>
+                                    {isRequired && <span className="text-xs">(Required)</span>}
                                   </div>
-                                )}
-                              />
-                            );
-                          })}
-                        </div>
+                                </div>
+                              )}
+                            />
+                          );
+                        })}
+                      </div>
                     </AccordionContent>
                   </AccordionItem>
                 </Accordion>
diff --git a/frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx b/frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx
index b6f28bede..5b0d1c98e 100644
--- a/frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx
+++ b/frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx
@@ -29,6 +29,7 @@ export const PoliciesPage = () => {
       </Helmet>
       <div className="mx-auto mb-6 w-full max-w-7xl">
         <PageHeader
+          scope="project"
           title="Certificate Policies"
           description="Manage certificate templates and profiles for unified certificate issuance"
         />
diff --git a/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants.ts b/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants.ts
index 684ffd85f..c615ad8e5 100644
--- a/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants.ts
+++ b/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants.ts
@@ -148,7 +148,6 @@ export const formatSanEffect = (effect: CertSanEffect): string => {
   }
 };
 
-
 export const SAN_TYPE_OPTIONS = Object.values(CertSubjectAlternativeNameType);
 export const KEY_USAGE_OPTIONS = Object.values(CertKeyUsageType);
 export const EXTENDED_KEY_USAGE_OPTIONS = Object.values(CertExtendedKeyUsageType);
@@ -165,7 +164,7 @@ export const USAGE_STATES = {
   OPTIONAL: "optional"
 } as const;
 
-export type UsageState = typeof USAGE_STATES[keyof typeof USAGE_STATES] | undefined;
+export type UsageState = (typeof USAGE_STATES)[keyof typeof USAGE_STATES] | undefined;
 
 export const TEMPLATE_SIGNATURE_ALGORITHMS = [
   "SHA256-RSA",
@@ -225,4 +224,3 @@ export const mapTemplateKeyAlgorithmToApi = (templateFormat: string): string =>
   };
   return mapping[templateFormat] || templateFormat;
 };
-
diff --git a/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/schemas.ts b/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/schemas.ts
index 4416cc680..5ab4e79bd 100644
--- a/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/schemas.ts
+++ b/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/schemas.ts
@@ -6,8 +6,8 @@ import {
   CertKeyUsageType,
   CertSubjectAlternativeNameType,
   CertSubjectAttributeType,
-  SUBJECT_ATTRIBUTE_INCLUDE_OPTIONS,
-  SAN_INCLUDE_OPTIONS
+  SAN_INCLUDE_OPTIONS,
+  SUBJECT_ATTRIBUTE_INCLUDE_OPTIONS
 } from "./certificate-constants";
 
 export const uiAttributeSchema = z.object({