diff --git a/frontend/src/components/Policies/CreatePolicyDialog.tsx b/frontend/src/components/Policies/CreatePolicyDialog.tsx
index bd7342b..5ecd042 100644
--- a/frontend/src/components/Policies/CreatePolicyDialog.tsx
+++ b/frontend/src/components/Policies/CreatePolicyDialog.tsx
@@ -74,7 +74,7 @@ const CreatePolicyDialog: React.FC<CreatePolicyDialogProps> = ({
   const generatePreview = () => {
     if (bucketName && selectedTemplate) {
       const generatedPolicy = policyService.generatePolicyFromTemplate(selectedTemplate, bucketName);
-      setCustomPolicy(generatedPolicy);
+      setCustomPolicy(JSON.stringify(generatedPolicy, null, 2));
     }
   };
 
@@ -111,7 +111,7 @@ const CreatePolicyDialog: React.FC<CreatePolicyDialogProps> = ({
         setError('Bucket name is required');
         return;
       }
-      policyToCreate = policyService.generatePolicyFromTemplate(selectedTemplate, bucketName);
+      policyToCreate = JSON.stringify(policyService.generatePolicyFromTemplate(selectedTemplate, bucketName), null, 2);
     }
 
     if (!validatePolicy()) {
diff --git a/frontend/src/services/policyService.ts b/frontend/src/services/policyService.ts
index f8a6783..d25a031 100644
--- a/frontend/src/services/policyService.ts
+++ b/frontend/src/services/policyService.ts
@@ -12,7 +12,7 @@ export interface Policy {
 
 export interface CreatePolicyRequest {
   name: string;
-  policy: string;
+  policy: string | object;
 }
 
 export interface AttachPolicyRequest {
@@ -220,13 +220,12 @@ class PolicyService {
   }
 
   // Generate policy from template
-  generatePolicyFromTemplate(templateKey: string, bucketName: string): string {
+  generatePolicyFromTemplate(templateKey: string, bucketName: string): object {
     const template = policyTemplates[templateKey];
     if (!template) {
       throw new Error('Invalid template');
     }
-    const policy = template.generatePolicy(bucketName);
-    return JSON.stringify(policy, null, 2);
+    return template.generatePolicy(bucketName);
   }
 }