diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/AddTFVarForm.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/AddTFVarForm.tsx
new file mode 100644
index 00000000..a0061296
--- /dev/null
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/AddTFVarForm.tsx
@@ -0,0 +1,146 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import { Card } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { T } from "@/components/ui/Typography";
+import { addTFVar } from "@/data/admin/env-vars";
+import { useSAToastMutation } from "@/hooks/useSAToastMutation";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Plus } from "lucide-react";
+import { useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { z } from "zod";
+
+
+
+
+export default function AddTFVarForm({
+    projectId,
+    organizationId,
+    isAllowedSecrets,
+    envVarNames,
+}: {
+    projectId: string;
+    organizationId: string;
+    isAllowedSecrets: boolean;
+    envVarNames: string[];
+}) {
+    const [showForm, setShowForm] = useState(false);
+
+    const addTFVarSchema = z.object({
+        name: z.string()
+            .min(1, "Name is required")
+            .refine((value) => !envVarNames.includes(value), {
+                message: "Environment variable name already exists",
+            }),
+        value: z.string().min(1, "Value is required"),
+        is_secret: z.boolean(),
+    });
+
+    const { mutate: addEnvVar, isLoading: isAddingEnvVar } = useSAToastMutation(
+        async (data: z.infer<typeof addTFVarSchema>) =>
+            addTFVar(data.name, data.value, data.is_secret, projectId, organizationId),
+        {
+            loadingMessage: "Adding environment variable...",
+            successMessage: "Environment variable added!",
+            errorMessage: "Failed to add environment variable",
+            onSuccess: () => {
+                reset();
+                setShowForm(false);
+            },
+        }
+    )
+
+    const { handleSubmit, register, reset, control, watch, formState: { errors } } = useForm<z.infer<typeof addTFVarSchema>>({
+        resolver: zodResolver(addTFVarSchema),
+        defaultValues: {
+            name: '',
+            value: '',
+            is_secret: false,
+        },
+    });
+
+    const onSubmit = (data: z.infer<typeof addTFVarSchema>) => {
+        addEnvVar(data);
+    }
+
+    return (
+        <>
+            {showForm ? (
+                <Card className="p-5 mt-4 bg-muted/50 rounded-lg">
+                    <T.H4 className=" mt-1">Add a new environment variable</T.H4>
+                    <T.P className="mt-0 pt-0 mb-4">Enter the environment variable details. These variables will be assigned to your project</T.P>
+                    <form onSubmit={handleSubmit(onSubmit)}>
+                        <div className="grid gap-4 grid-cols-1 md:grid-cols-3">
+                            <div className="relative">
+                                <Label htmlFor="varName">Variable Name</Label>
+                                <Input
+                                    id="varName"
+                                    placeholder="e.g., API_KEY"
+                                    {...register('name')}
+                                    onChange={(e) => e.target.value = e.target.value.toUpperCase()}
+                                    className={errors.name ? "border-destructive" : ""}
+                                />
+                                {errors.name && <p className="text-destructive text-sm mt-1 absolute -bottom-6">{errors.name.message}</p>}
+                            </div>
+                            <div className="relative">
+                                <Label htmlFor="varValue">Variable Value</Label>
+                                <Controller
+                                    name="value"
+                                    control={control}
+                                    render={({ field }) => (
+                                        <Input
+                                            id="varValue"
+                                            type={watch('is_secret') ? "password" : "text"}
+                                            placeholder="Enter value"
+                                            {...field}
+                                            className={errors.value ? "border-destructive" : ""}
+                                        />
+                                    )}
+                                />
+                                {errors.value && <p className="text-destructive text-sm mt-1 absolute -bottom-6">{errors.value.message}</p>}
+                            </div>
+                            <div>
+                                <Label htmlFor="varType">Variable Type</Label>
+                                <Controller
+                                    name="is_secret"
+                                    control={control}
+                                    render={({ field }) => (
+                                        <Select
+                                            value={field.value ? "secret" : "plain_text"}
+                                            onValueChange={(value) => field.onChange(value === "secret")}
+                                        >
+                                            <SelectTrigger>
+                                                <SelectValue placeholder="Select type" />
+                                            </SelectTrigger>
+                                            <SelectContent>
+                                                <SelectItem value="plain_text">Plain Text</SelectItem>
+                                                <SelectItem value="secret">Secret</SelectItem>
+                                            </SelectContent>
+                                        </Select>
+                                    )}
+                                />
+                            </div>
+                        </div>
+                        <div className="mt-4 flex justify-end w-full">
+                            <Button type="submit" variant='outline' disabled={isAddingEnvVar}>
+                                <Plus className="h-4 w-4 mr-2" />
+                                {isAddingEnvVar ? 'Adding...' : 'Add Variable'}
+                            </Button>
+                        </div>
+                    </form>
+                </Card>
+            ) : (
+                <div className="mt-4 flex justify-end w-full" >
+                    <Button onClick={() => setShowForm(true)} variant='outline' disabled={!isAllowedSecrets} >
+                        <Plus className="h-4 w-4 mr-2" />
+                        Add a new environment variable
+                    </Button>
+                </div>
+            )}
+        </>
+    );
+}
\ No newline at end of file
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/BulkEditTFVars.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/BulkEditTFVars.tsx
new file mode 100644
index 00000000..e4ebabd9
--- /dev/null
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/BulkEditTFVars.tsx
@@ -0,0 +1,48 @@
+'use client'
+
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
+import { bulkUpdateTFVars } from "@/data/admin/env-vars";
+import { useSAToastMutation } from "@/hooks/useSAToastMutation";
+import { useState } from "react";
+
+export function BulkEditTFVars({ projectId, organizationId, initialBulkEditValue, setIsBulkEditing }: {
+    projectId: string;
+    organizationId: string;
+    initialBulkEditValue: string;
+    setIsBulkEditing: (value: boolean) => void;
+}) {
+    const [bulkEditValue, setBulkEditValue] = useState(initialBulkEditValue);
+
+
+    const { mutate: bulkEditTFVars, isLoading: isBulkEditingTFVars } = useSAToastMutation(
+        async (data: string) => bulkUpdateTFVars(data, projectId, organizationId), {
+        loadingMessage: "Applying bulk edit...",
+        successMessage: "Bulk edit applied!",
+        errorMessage: "Failed to apply bulk edit",
+        onSuccess: (response) => {
+            setBulkEditValue(JSON.stringify(response, null, 2));
+            setIsBulkEditing(false);
+        },
+    }
+    )
+
+    return (
+        <div className="space-y-4" >
+            <Textarea
+                value={bulkEditValue}
+                onChange={(e) => setBulkEditValue(e.target.value)}
+                rows={24}
+                className="font-mono"
+            />
+            <div className="flex gap-2 w-full justify-between">
+                <Button variant="outline" onClick={() => setIsBulkEditing(false)}>Cancel</Button>
+                <Button onClick={() => bulkEditTFVars(bulkEditValue)} disabled={isBulkEditingTFVars}>
+                    {isBulkEditingTFVars ? 'Applying...' : 'Apply Bulk Edit'}
+                </Button>
+            </div>
+        </div >
+    )
+}
+
+
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/EncryptionTestComponent.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/EncryptionTestComponent.tsx
new file mode 100644
index 00000000..522d673b
--- /dev/null
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/EncryptionTestComponent.tsx
@@ -0,0 +1,136 @@
+'use client';
+
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import { decryptWithPrivateKey, encryptWithPublicKey, formatKey } from "@/utils/crypto";
+import { motion } from 'framer-motion';
+import { useState } from 'react';
+
+export default function EncryptionTestComponent({
+    organizationId,
+    publicKey: publicKeyFromProps,
+}: {
+    organizationId: string;
+    publicKey: string | null;
+}) {
+
+
+    const [envVar, setEnvVar] = useState('');
+    const [encryptedVar, setEncryptedVar] = useState('');
+    const [decryptedVar, setDecryptedVar] = useState('');
+    const [isMatch, setIsMatch] = useState<boolean | null>(null);
+
+
+    const [publicKey, setPublicKey] = useState<string | null>(publicKeyFromProps || null);
+    const [privateKey, setPrivateKey] = useState('');
+
+    const formattedPublicKey = publicKey ? formatKey(publicKey, 'public') : '';
+    const formattedPrivateKey = privateKey ? formatKey(privateKey, 'private') : '';
+
+
+    const handleEncrypt = async () => {
+        try {
+            if (!formattedPublicKey) {
+                throw new Error('Public key is not available');
+            }
+            console.log('---------------------------------');
+            console.log('formattedPublicKey', formattedPublicKey);
+
+            const encrypted = encryptWithPublicKey(envVar, formattedPublicKey);
+            console.log('encrypted', encrypted);
+            setEncryptedVar(encrypted);
+        } catch (error) {
+            console.error('Encryption error:', error);
+            setEncryptedVar('Encryption failed: ' + (error instanceof Error ? error.message : String(error)));
+        }
+    };
+
+    const handleDecrypt = async () => {
+        try {
+            console.log('---------------------------------');
+            console.log('formattedPrivateKey', formattedPrivateKey);
+            const decrypted = decryptWithPrivateKey(encryptedVar, formattedPrivateKey);
+            console.log('decrypted', decrypted);
+            setDecryptedVar(decrypted);
+            setIsMatch(decrypted === envVar);
+        } catch (error) {
+            console.error('Decryption error:', error);
+            setDecryptedVar(`Decryption failed: ${error instanceof Error ? error.message : String(error)}`);
+            setIsMatch(false);
+        }
+    };
+
+    return (
+        <motion.div
+            initial={{ opacity: 0, y: 20 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ duration: 0.5 }}
+        >
+            <pre>{JSON.stringify(publicKey, null, 2)}</pre>
+            <pre>{JSON.stringify(privateKey, null, 2)}</pre>
+            <Card>
+                <CardHeader>
+                    <CardTitle>Encryption/Decryption Test</CardTitle>
+                </CardHeader>
+                <CardContent className="space-y-4">
+                    <div>
+                        <Label htmlFor="envVar">Environment Variable</Label>
+                        <Input
+                            id="envVar"
+                            value={envVar}
+                            onChange={(e) => setEnvVar(e.target.value)}
+                            placeholder="Enter environment variable"
+                        />
+                        <Button onClick={handleEncrypt} className="mt-2">Encrypt</Button>
+                    </div>
+
+                    <div>
+                        <Label htmlFor="encryptedVar">Encrypted Variable</Label>
+                        <Input
+                            id="encryptedVar"
+                            value={encryptedVar}
+                            readOnly
+                            placeholder="Encrypted value will appear here"
+                        />
+                    </div>
+
+                    <div>
+                        <Label htmlFor="privateKey">Private Key</Label>
+                        <Textarea
+                            id="privateKey"
+                            value={privateKey}
+                            onChange={(e) => setPrivateKey(e.target.value)}
+                            placeholder="Enter private key"
+                            className="w-full h-32 p-2 border rounded"
+                        />
+                        <Button onClick={handleDecrypt} className="mt-2">Decrypt</Button>
+                    </div>
+
+                    <div>
+                        <Label htmlFor="decryptedVar">Decrypted Variable</Label>
+                        <Input
+                            id="decryptedVar"
+                            value={decryptedVar}
+                            readOnly
+                            placeholder="Decrypted value will appear here"
+                        />
+                        {decryptedVar && <p>Decrypted: {decryptedVar}</p>}
+                        {encryptedVar && <p>Encrypted: {encryptedVar}</p>}
+                    </div>
+
+                    {isMatch !== null && (
+                        <div>
+                            {isMatch
+                                ? <p className="text-green-500">The decrypted value matches the original value!</p>
+                                : <p className="text-red-500">The decrypted value does not match the original value.</p>
+                            }
+                        </div>
+                    )}
+                </CardContent>
+            </Card>
+        </motion.div>
+    );
+}
\ No newline at end of file
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTable.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTable.tsx
index 7d38d9c2..0b233c92 100644
--- a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTable.tsx
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTable.tsx
@@ -1,22 +1,23 @@
 'use client'
 
-import { T } from "@/components/ui/Typography";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Separator } from "@/components/ui/separator";
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
-import { Textarea } from "@/components/ui/textarea";
-import { tfvarsOnBulkUpdate, tfvarsOnDelete, tfvarsOnUpdate } from "@/data/user/tfvars";
-import { EnvVar } from "@/types/userTypes";
+import { Table, TableBody, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+import { Table as DBTable } from "@/types";
 import { motion } from 'framer-motion';
-import { AlertTriangle, Copy, Edit, LockKeyhole, Plus, Save, Trash, Unlock } from 'lucide-react';
-import moment from 'moment';
-import { useRouter } from 'next/navigation';
+import { AlertTriangle, Plus } from 'lucide-react';
 import { useState } from 'react';
-import { toast } from 'sonner';
+import { z } from "zod";
+import AddTFVarForm from "./AddTFVarForm";
+import { BulkEditTFVars } from "./BulkEditTFVars";
+import { TFVarTableRow } from "./TFVarTableRow";
+
+export const envVarSchema = z.object({
+    name: z.string(),
+    value: z.string(),
+    is_secret: z.boolean(),
+});
 
 const EmptyState: React.FC<{ onAddVariable: () => void }> = ({ onAddVariable }) => {
     return (
@@ -45,306 +46,78 @@ const EmptyState: React.FC<{ onAddVariable: () => void }> = ({ onAddVariable })
     );
 };
 
+
 type TFVarTableProps = {
-    envVars: EnvVar[];
+    envVars: DBTable<'env_vars'>[];
     projectId: string;
     orgId: string;
     isAllowedSecrets: boolean;
 };
 
 export default function TFVarTable({ projectId, orgId, isAllowedSecrets, envVars }: TFVarTableProps) {
-    const [editingVar, setEditingVar] = useState<{ originalName: string, currentVar: EnvVar } | null>(null);
-    const [newVar, setNewVar] = useState<Omit<EnvVar, 'updated_at'>>({ name: '', value: '', is_secret: false });
-    const [bulkEditMode, setBulkEditMode] = useState(false);
-    const [bulkEditValue, setBulkEditValue] = useState<string>('');
-    const [isLoading, setIsLoading] = useState(false);
-    const [showAddForm, setShowAddForm] = useState(false);
-    const router = useRouter();
-
-    const handleEdit = (envVar: EnvVar) => {
-        setEditingVar({
-            originalName: envVar.name,
-            currentVar: {
-                ...envVar,
-                value: envVar.is_secret ? '' : envVar.value
-            }
-        });
-    };
-
-    const handleSave = async () => {
-        if (editingVar) {
-            if (editingVar.currentVar.name.toLowerCase() !== editingVar.originalName.toLowerCase() &&
-                envVars.some(v => v.name.toLowerCase() === editingVar.currentVar.name.toLowerCase())) {
-                toast.error('A variable with this name already exists');
-                return;
-            }
-            setIsLoading(true);
-            try {
-                await tfvarsOnUpdate(
-                    editingVar.originalName,
-                    editingVar.currentVar.name,
-                    editingVar.currentVar.value,
-                    editingVar.currentVar.is_secret,
-                    projectId,
-                    orgId,
-                );
-                toast.success('Variable updated successfully');
-                setEditingVar(null);
-                router.refresh();
-            } catch (error) {
-                toast.error('Failed to update variable');
-            } finally {
-                setIsLoading(false);
-            }
-        }
-    };
-
-    const handleAddNew = async () => {
-        if (newVar.name && newVar.value) {
-            if (envVars.some(v => v.name.toLowerCase() === newVar.name.toLowerCase())) {
-                toast.error('A variable with this name already exists');
-                return;
-            }
-            setIsLoading(true);
-            try {
-                await tfvarsOnUpdate(newVar.name, newVar.name, newVar.value, newVar.is_secret, projectId, orgId);
-                toast.success('New variable added successfully');
-                setNewVar({ name: '', value: '', is_secret: false });
-                setShowAddForm(false);
-                router.refresh();
-            } catch (error) {
-                toast.error('Failed to add new variable');
-            } finally {
-                setIsLoading(false);
-            }
-        }
-    };
-
-    const handleDeleteVar = async (name: string) => {
-        setIsLoading(true);
-        try {
-            await tfvarsOnDelete(name, projectId);
-            toast.success('Variable deleted successfully');
-            router.refresh();
-        } catch (error) {
-            toast.error('Failed to delete variable');
-        } finally {
-            setIsLoading(false);
-        }
-    };
+    const [isBulkEditing, setIsBulkEditing] = useState(false);
+    const initialBulkEditValue = JSON.stringify(
+        envVars.filter(envVar => !envVar.is_secret).map(envVar => ({ name: envVar.name, value: envVar.value })),
+        null,
+        2
+    )
 
-    const handleBulkEdit = async () => {
-        try {
-            const parsedVars = JSON.parse(bulkEditValue);
-            if (Array.isArray(parsedVars)) {
-                const names = parsedVars.map(v => v.name.toLowerCase());
-                if (new Set(names).size !== names.length) {
-                    toast.error('Duplicate variable names are not allowed');
-                    return;
-                }
-
-                setIsLoading(true);
-                await tfvarsOnBulkUpdate(parsedVars, projectId, orgId);
-                toast.success('Bulk update successful');
-                setBulkEditMode(false);
-                router.refresh();
-            }
-        } catch (error) {
-            toast.error('Error parsing JSON or updating variables');
-        } finally {
-            setIsLoading(false);
-        }
-    };
-
-    const toggleBulkEdit = () => {
-        if (!bulkEditMode) {
-            const nonSecretVars = envVars.filter(v => !v.is_secret).map(({ name, value }) => ({ name, value }));
-            setBulkEditValue(JSON.stringify(nonSecretVars, null, 2));
-        }
-        setBulkEditMode(!bulkEditMode);
-    };
-
-    const handleCopy = (envVar: EnvVar) => {
-        const copyText = JSON.stringify({
-            name: envVar.name,
-            value: envVar.is_secret ? '********' : envVar.value,
-            updated_at: envVar.updated_at
-        }, null, 2);
-        navigator.clipboard.writeText(copyText);
-        toast.success('Copied to clipboard');
-    };
-
-    const handleCopyAll = () => {
-        const copyText = JSON.stringify(envVars.map(v => ({
-            ...v,
-            value: v.is_secret ? '********' : v.value
-        })), null, 2);
-        navigator.clipboard.writeText(copyText);
-        toast.success('All variables copied to clipboard');
-    };
+    const [showAddForm, setShowAddForm] = useState(false);
 
-    if (bulkEditMode) {
-        return (
-            <div className="space-y-4">
-                <Textarea
-                    value={bulkEditValue}
-                    onChange={(e) => setBulkEditValue(e.target.value)}
-                    rows={24}
-                    className="font-mono"
-                />
-                <div className="flex gap-2 w-full justify-end">
-                    <Button variant="outline" onClick={toggleBulkEdit}>Cancel</Button>
-                    <Button onClick={handleBulkEdit} disabled={isLoading}>
-                        {isLoading ? 'Applying...' : 'Apply Bulk Edit'}
-                    </Button>
-                </div>
-            </div>
-        );
-    }
     if (envVars.length === 0 && !showAddForm) {
         return <EmptyState onAddVariable={() => setShowAddForm(true)} />;
     }
 
     return (
         <div className="space-y-4">
-            <Table>
-                {envVars.length > 0 && (
-                    <TableHeader>
-                        <TableRow>
-                            <TableHead>Name</TableHead>
-                            <TableHead>Value</TableHead>
-                            <TableHead>Secret</TableHead>
-                            <TableHead>Last Updated</TableHead>
-                            <TableHead>Copy</TableHead>
-                            <TableHead>Edit</TableHead>
-                            <TableHead>Delete</TableHead>
-                        </TableRow>
-                    </TableHeader>
-                )}
-                <TableBody>
-                    {envVars.map((envVar, index) => (
-                        <TableRow key={envVar.name}>
-                            <TableCell>
-                                {editingVar && editingVar.originalName === envVar.name ? (
-                                    <Input
-                                        value={editingVar.currentVar.name}
-                                        onChange={(e) => setEditingVar({
-                                            ...editingVar,
-                                            currentVar: { ...editingVar.currentVar, name: e.target.value.toUpperCase() }
-                                        })}
-                                    />
-                                ) : (
-                                    envVar.name
-                                )}</TableCell>
-                            <TableCell>
-                                {editingVar && editingVar.originalName === envVar.name ? (
-                                    <Input
-                                        type={editingVar.currentVar.is_secret ? "password" : "text"}
-                                        value={editingVar.currentVar.value}
-                                        onChange={(e) => setEditingVar({
-                                            ...editingVar,
-                                            currentVar: { ...editingVar.currentVar, value: e.target.value }
-                                        })}
-                                        placeholder={editingVar.currentVar.is_secret ? "Enter new secret value" : ""}
-                                    />
-                                ) : (
-                                    <span>{envVar.is_secret ? '********' : envVar.value}</span>
-                                )}
-                            </TableCell>
-                            <TableCell>
-                                {envVar.is_secret ? <LockKeyhole className="h-4 w-4" /> : <Unlock className="h-4 w-4" />}
-                            </TableCell>
-                            <TableCell>{moment(envVar.updated_at).fromNow()}</TableCell>
-                            <TableCell>
-                                <Button variant="ghost" size="icon" onClick={() => handleCopy(envVar)}>
-                                    <Copy className="h-4 w-4" />
-                                </Button>
-                            </TableCell>
-                            <TableCell>
-                                {editingVar && editingVar.originalName === envVar.name ? (
-                                    <Button variant="ghost" size="icon" onClick={handleSave} disabled={isLoading}>
-                                        <Save className="h-4 w-4" />
-                                    </Button>
-                                ) : (
-                                    <Button variant="ghost" size="icon" onClick={() => handleEdit(envVar)}>
-                                        <Edit className="h-4 w-4" />
-                                    </Button>
-                                )}
-                            </TableCell>
-                            <TableCell>
-                                <Button variant="ghost" size="icon" onClick={() => handleDeleteVar(envVar.name)} disabled={isLoading}>
-                                    <Trash className="h-4 w-4 text-destructive" />
-                                </Button>
-                            </TableCell>
-                        </TableRow>
-                    ))}
-                </TableBody>
-            </Table>
-
-            {(showAddForm || envVars.length === 0) && (
-                <Card className="p-5 mt-4 bg-muted/50 rounded-lg">
-                    <T.H4 className=" mt-1">Add a new environment variable</T.H4>
-                    <T.P className="mt-0 pt-0 mb-4">Enter the environment variable details. These variables will be assigned to your project</T.P>
-                    <div className="grid gap-4 grid-cols-1 md:grid-cols-3">
-                        <div>
-                            <Label htmlFor="varName">Variable Name</Label>
-                            <Input
-                                id="varName"
-                                placeholder="e.g., API_KEY"
-                                value={newVar.name}
-                                onChange={(e) => setNewVar({ ...newVar, name: e.target.value.toUpperCase() })}
-                            />
-                        </div>
-                        <div>
-                            <Label htmlFor="varValue">Variable Value</Label>
-                            <Input
-                                id="varValue"
-                                type={newVar.is_secret ? "password" : "text"}
-                                placeholder="Enter value"
-                                value={newVar.value}
-                                onChange={(e) => setNewVar({ ...newVar, value: e.target.value })}
-                            />
-                        </div>
-                        <div>
-                            <Label htmlFor="varType">Variable Type</Label>
-                            <Select
-                                value={newVar.is_secret ? "secret" : "plain_text"}
-                                onValueChange={(value) => setNewVar({ ...newVar, is_secret: value === "secret" })}
-                            >
-                                <SelectTrigger>
-                                    <SelectValue placeholder="Select type" />
-                                </SelectTrigger>
-                                <SelectContent>
-                                    <SelectItem value="plain_text">Plain Text</SelectItem>
-                                    <SelectItem value="secret" disabled={!isAllowedSecrets}>Secret</SelectItem>
-                                </SelectContent>
-                            </Select>
-                        </div>
-                    </div>
-                    <div className="mt-4 flex justify-end">
-                        <Button onClick={handleAddNew} disabled={isLoading || !newVar.name || !newVar.value}>
-                            <Plus className="h-4 w-4 mr-2" />
-                            {isLoading ? 'Adding...' : 'Add Variable'}
-                        </Button>
-                    </div>
-                    {!isAllowedSecrets && (<div className="mt-4 flex justify-start">
-                        <span className="flex items-center text-orange-400">
-                            <AlertTriangle className="h-4 w-4 mr-2" />
-                            <em className="text-sm italic">
-                                To enable secrets creation, configure Secrets Key in your Organisation Settings
-                            </em>
-                        </span>
-                    </div>)}
-                </Card>
+            {isBulkEditing ? (
+                <BulkEditTFVars
+                    projectId={projectId}
+                    organizationId={orgId}
+                    initialBulkEditValue={initialBulkEditValue}
+                    setIsBulkEditing={setIsBulkEditing}
+                />
+            ) : (
+                <>
+                    <Table>
+                        {envVars.length > 0 && (
+                            <TableHeader>
+                                <TableRow>
+                                    <TableHead>Name</TableHead>
+                                    <TableHead>Value</TableHead>
+                                    <TableHead>Secret</TableHead>
+                                    <TableHead>Last Updated</TableHead>
+                                    <TableHead>Copy</TableHead>
+                                    <TableHead>Edit</TableHead>
+                                    <TableHead>Delete</TableHead>
+                                </TableRow>
+                            </TableHeader>
+                        )}
+                        <TableBody>
+                            {envVars
+                                .sort((a, b) => new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime())
+                                .map((envVar) => (
+                                    <TFVarTableRow key={envVar.id} id={envVar.id} envVar={envVar} projectId={projectId} organizationId={orgId} />
+                                ))}
+                        </TableBody>
+                    </Table>
+
+                    {isAllowedSecrets ? (
+                        <AddTFVarForm isAllowedSecrets={isAllowedSecrets} projectId={projectId} organizationId={orgId} envVarNames={envVars.map(envVar => envVar.name)} />
+                    ) : (
+                        <div className="mt-4 flex justify-start">
+                            <span className="flex items-center text-orange-400">
+                                <AlertTriangle className="h-4 w-4 mr-2" />
+                                <em className="text-sm italic">
+                                    To enable secrets creation, configure Secrets Key in your Organisation Settings
+                                </em>
+                            </span>
+                        </div>)}
+                </>
             )}
 
             {envVars.length > 0 && (
                 <>
-                    <div className="mt-4 flex justify-end">
-                        <Button variant="outline" onClick={() => setShowAddForm(!showAddForm)}>
-                            {showAddForm ? 'Cancel' : 'Add New Variable'}
-                        </Button>
-                    </div>
                     <Separator className="my-4" />
                     <div className="mt-8">
                         <h3 className="text-lg font-semibold">Bulk Edit Environment Variables</h3>
@@ -352,8 +125,8 @@ export default function TFVarTable({ projectId, orgId, isAllowedSecrets, envVars
                             Edit all environment variables at once in JSON format. Be careful with this operation.
                         </p>
                         <div className="flex gap-2">
-                            <Button variant="secondary" className="w-full" onClick={toggleBulkEdit}>
-                                {bulkEditMode ? 'Cancel Bulk Edit' : 'Bulk Edit'}
+                            <Button variant="secondary" className="w-full" onClick={() => setIsBulkEditing(true)}>
+                                {isBulkEditing ? 'Cancel Bulk Edit' : 'Bulk Edit'}
                             </Button>
                         </div>
                     </div>
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTableRow.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTableRow.tsx
new file mode 100644
index 00000000..7e57206f
--- /dev/null
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarTableRow.tsx
@@ -0,0 +1,135 @@
+'use client'
+
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { TableCell, TableRow } from "@/components/ui/table";
+import { deleteTFVar, updateTFVar } from "@/data/admin/env-vars";
+import { useSAToastMutation } from "@/hooks/useSAToastMutation";
+import { Table } from "@/types";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Copy, Edit, LockKeyhole, Save, Trash, Unlock } from "lucide-react";
+import moment from "moment";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { envVarSchema } from "./TFVarTable";
+
+
+export function TFVarTableRow({ id, projectId, envVar, organizationId }: { id: string, projectId: string, envVar: Table<'env_vars'>, organizationId: string }) {
+    const [isEditingVar, setIsEditingVar] = useState<boolean>(false);
+
+    const { mutate: updateEnvVar, isLoading: isUpdatingEnvVar } = useSAToastMutation(
+        async (data: Table<'env_vars'>) =>
+            updateTFVar(data, envVar.is_secret, projectId, organizationId),
+        {
+            loadingMessage: "Updating environment variable...",
+            successMessage: "Environment variable updated!",
+            errorMessage: "Failed to update environment variable",
+            onSuccess: (response) => {
+                if (response.status === 'success') {
+                    setIsEditingVar(false);
+                } else {
+                    setIsEditingVar(false);
+                }
+            },
+        }
+    )
+
+    const { mutate: deleteEnvVar, isLoading: isDeletingEnvVar } = useSAToastMutation(
+        async () =>
+            deleteTFVar(projectId, id),
+        {
+            loadingMessage: "Deleting environment variable...",
+            successMessage: "Environment variable deleted!",
+            errorMessage: "Failed to delete environment variable",
+            onSuccess: () => {
+                setIsEditingVar(false);
+            },
+        }
+    )
+
+    const { handleSubmit, register, reset } = useForm<z.infer<typeof envVarSchema>>({
+        resolver: zodResolver(envVarSchema),
+        defaultValues: {
+            name: envVar.name,
+            value: envVar.is_secret ? '' : envVar.value,
+            is_secret: envVar.is_secret,
+        },
+    });
+
+    const onSubmit = (data: z.infer<typeof envVarSchema>) => {
+        updateEnvVar({ ...data, id, project_id: projectId, updated_at: new Date().toISOString() });
+    }
+
+    return (
+        <TableRow>
+            <TableCell>
+                {isEditingVar ? (
+                    <Input
+                        {...register("name")}
+                        defaultValue={envVar.name}
+                        className="w-full"
+                    />
+                ) : (
+                    envVar.name
+                )}
+            </TableCell>
+            <TableCell>
+                {isEditingVar ? (
+                    <Input
+                        type={envVar.is_secret ? "password" : "text"}
+                        defaultValue={envVar.is_secret ? '' : envVar.value}
+                        {...register("value")}
+                        placeholder={envVar.is_secret ? "Enter new secret value" : ""}
+                        className="w-full"
+                    />
+                ) : (
+                    <span>{envVar.is_secret ? '********' : envVar.value}</span>
+                )}
+            </TableCell>
+            <TableCell>
+                {envVar.is_secret ? <LockKeyhole className="h-4 w-4" /> : <Unlock className="h-4 w-4" />}
+            </TableCell>
+            <TableCell>{moment(envVar.updated_at).fromNow()}</TableCell>
+            <TableCell>
+                <Button variant="ghost" size="icon" onClick={() => {
+                    navigator.clipboard.writeText(JSON.stringify({ name: envVar.name, value: envVar.value }));
+                    toast.success("Copied to clipboard");
+                }}>
+                    <Copy className="h-4 w-4" />
+                </Button>
+            </TableCell>
+            <TableCell>
+                {isEditingVar ? (
+                    <div className="flex space-x-2">
+                        <Button variant="ghost" size="icon" onClick={handleSubmit(onSubmit)} disabled={isUpdatingEnvVar}>
+                            <Save className="h-4 w-4" />
+                        </Button>
+                    </div>
+                ) : (
+                    <Button
+                        variant="ghost"
+                        size="icon"
+                        onClick={() => {
+                            setIsEditingVar(true);
+                            reset({
+                                name: envVar.name,
+                                value: envVar.is_secret ? '' : envVar.value,
+                                is_secret: envVar.is_secret,
+                            });
+                        }}
+                        disabled={isUpdatingEnvVar}
+                    >
+                        <Edit className="h-4 w-4" />
+                    </Button>
+                )}
+            </TableCell>
+            <TableCell>
+                <Button variant="ghost" size="icon" onClick={() => deleteEnvVar()} disabled={isDeletingEnvVar}>
+                    <Trash className="h-4 w-4 text-destructive" />
+                </Button>
+            </TableCell>
+        </TableRow>
+    );
+}
\ No newline at end of file
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarsDetails.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarsDetails.tsx
index b23d3964..3b5a6fb8 100644
--- a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarsDetails.tsx
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/TFVarsDetails.tsx
@@ -4,7 +4,7 @@
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
 import { Separator } from "@/components/ui/separator";
-import { EnvVar } from "@/types/userTypes";
+import { Table } from "@/types";
 import { motion } from "framer-motion";
 import TFVarTable from "./TFVarTable";
 
@@ -12,7 +12,7 @@ type TFVarsDetailsProps = {
     projectId: string;
     orgId: string;
     isAllowedSecrets: boolean;
-    initialEnvVars: EnvVar[];
+    initialEnvVars: Table<'env_vars'>[];
 }
 
 export default function TFVarsDetails({ projectId, orgId, isAllowedSecrets, initialEnvVars }: TFVarsDetailsProps) {
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/tfvars/page.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/tfvars/page.tsx
index 0ffe3195..43992ead 100644
--- a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/tfvars/page.tsx
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/tfvars/page.tsx
@@ -25,6 +25,7 @@ export default async function TFVarsPage({ params }: { params: unknown }) {
         getOrganizationPublicKey(project.organization_id)
     ]);
 
+
     return (
         <div className="flex flex-col space-y-4 max-w-5xl mt-2">
             <TFVarsDetails
diff --git a/src/data/admin/env-vars.ts b/src/data/admin/env-vars.ts
index 2df08b15..198e42c7 100644
--- a/src/data/admin/env-vars.ts
+++ b/src/data/admin/env-vars.ts
@@ -1,29 +1,38 @@
 'use server';
 
 import { supabaseAdminClient } from '@/supabase-clients/admin/supabaseAdminClient';
+import { SAPayload, Table } from '@/types';
 import { EnvVar } from '@/types/userTypes';
-import { constants, publicEncrypt } from 'crypto';
+import { encryptWithPublicKey, formatKey } from '@/utils/crypto';
+import crypto, { constants, privateDecrypt, publicEncrypt } from 'crypto';
+import { revalidatePath } from 'next/cache';
+import { tfvarsOnBulkUpdate } from '../user/tfvars';
 
 export async function encryptSecretWithPublicKey(
   text: string,
   publicKey: string,
 ): Promise<string> {
   if (!publicKey) {
-    console.error('No secrets key in the org');
     throw new Error('No secrets key in the org');
   }
+
+  // Ensure the public key has the correct PEM format for encryption
+  const formattedPublicKey = publicKey.includes('-----BEGIN PUBLIC KEY-----')
+    ? publicKey
+    : `-----BEGIN PUBLIC KEY-----\n${publicKey}\n-----END PUBLIC KEY-----`;
+
   const buffer = Buffer.from(text, 'utf8');
   const encrypted = publicEncrypt(
     {
-      key: publicKey,
-      padding: constants.RSA_PKCS1_OAEP_PADDING,
-      oaepHash: 'sha256',
+      key: formattedPublicKey,
+      padding: constants.RSA_PKCS1_PADDING, // Changed from OAEP to PKCS1
     },
     buffer,
   );
+
+  // Return the encrypted value without headers
   return encrypted.toString('base64');
 }
-
 export async function getOrganizationPublicKey(
   orgId: string,
 ): Promise<string | null> {
@@ -34,7 +43,6 @@ export async function getOrganizationPublicKey(
     .single();
 
   if (error) {
-    console.error('Error fetching public key:', error);
     throw error;
   }
 
@@ -54,7 +62,8 @@ export async function storeEnvVar(
     if (!publicKey) {
       throw new Error('Cannot encrypt secret - no public key');
     }
-    storedValue = await encryptSecretWithPublicKey(value, publicKey);
+    const formattedPublicKey = publicKey ? formatKey(publicKey, 'public') : '';
+    storedValue = encryptWithPublicKey(value, formattedPublicKey);
   } else {
     storedValue = value;
   }
@@ -73,12 +82,121 @@ export async function storeEnvVar(
   );
 
   if (error) {
-    console.error('Error storing variable:', error);
     throw error;
   }
-  console.log('Variable stored successfully:', { name, isSecret });
   return data;
 }
+
+export async function updateTFVar(
+  envVar: Table<'env_vars'>,
+  isSecret: boolean,
+  projectId: string,
+  organizationId: string,
+): Promise<SAPayload<Table<'env_vars'>>> {
+  let storedValue;
+  if (isSecret) {
+    const publicKey = await getOrganizationPublicKey(organizationId);
+    if (!publicKey) {
+      throw new Error('Cannot encrypt secret - no public key');
+    }
+    const formattedPublicKey = publicKey ? formatKey(publicKey, 'public') : '';
+    storedValue = encryptWithPublicKey(envVar.value, formattedPublicKey);
+  } else {
+    storedValue = envVar.value;
+  }
+  const { data: updatedEnvVar, error } = await supabaseAdminClient
+    .from('env_vars')
+    .update({
+      name: envVar.name,
+      value: storedValue,
+      is_secret: isSecret,
+      updated_at: new Date().toISOString(),
+    })
+    .eq('id', envVar.id)
+    .eq('project_id', projectId)
+    .select();
+
+  if (error) {
+    return {
+      status: 'error',
+      message: error.message,
+    };
+  }
+
+  revalidatePath(`/project/${projectId}`);
+  return {
+    status: 'success',
+    data: updatedEnvVar[0],
+  };
+}
+
+export async function addTFVar(
+  name: string,
+  value: string,
+  isSecret: boolean,
+  projectId: string,
+  organizationId: string,
+): Promise<SAPayload<Table<'env_vars'>>> {
+  let storedValue;
+  if (isSecret) {
+    const publicKey = await getOrganizationPublicKey(organizationId);
+    if (!publicKey) {
+      throw new Error('Cannot encrypt secret - no public key');
+    }
+    const formattedPublicKey = publicKey ? formatKey(publicKey, 'public') : '';
+    storedValue = encryptWithPublicKey(value, formattedPublicKey);
+  } else {
+    storedValue = value;
+  }
+  const { data: updatedEnvVar, error } = await supabaseAdminClient
+    .from('env_vars')
+    .insert({
+      name,
+      value: storedValue,
+      is_secret: isSecret,
+      updated_at: new Date().toISOString(),
+      project_id: projectId,
+    })
+    .select();
+
+  if (error) {
+    return {
+      status: 'error',
+      message: error.message,
+    };
+  }
+
+  revalidatePath(`/project/${projectId}`);
+  return {
+    status: 'success',
+    data: updatedEnvVar[0],
+  };
+}
+
+export async function deleteTFVar(
+  projectId: string,
+  id: string,
+): Promise<SAPayload> {
+  const { error } = await supabaseAdminClient
+    .from('env_vars')
+    .delete()
+    .eq('project_id', projectId)
+    .eq('id', id);
+
+  if (error) {
+    return {
+      status: 'error',
+      message: error.message,
+    };
+  }
+
+  revalidatePath(`/project/${projectId}`);
+
+  return {
+    status: 'success',
+  };
+}
+
 export async function getEnvVar(projectId: string, name: string) {
   const { data, error } = await supabaseAdminClient
     .from('env_vars')
@@ -89,7 +207,7 @@ export async function getEnvVar(projectId: string, name: string) {
 
   if (error) throw error;
   if (data.is_secret) {
-    return { value: null, isSecret: true };
+    return { value: data.value, isSecret: true };
   } else {
     return { value: data.value, isSecret: false };
   }
@@ -115,10 +233,12 @@ export async function deleteEnvVar(projectId: string, name: string) {
   if (error) throw error;
 }
 
-export async function getAllEnvVars(projectId: string): Promise<EnvVar[]> {
+export async function getAllEnvVars(
+  projectId: string,
+): Promise<Table<'env_vars'>[]> {
   const { data, error } = await supabaseAdminClient
     .from('env_vars')
-    .select('name, value, is_secret, updated_at')
+    .select('*')
     .eq('project_id', projectId);
 
   if (error) throw error;
@@ -126,23 +246,73 @@ export async function getAllEnvVars(projectId: string): Promise<EnvVar[]> {
   // convert bytea to string
   return Promise.all(
     data.map(async (item) => {
-      console.log(item.value);
-      try {
-        return {
-          name: item.name,
-          value: item.is_secret ? '********' : item.value,
-          is_secret: item.is_secret,
-          updated_at: item.updated_at,
-        };
-      } catch (error) {
-        console.error(`Error processing item ${item.name}:`, error);
-        return {
-          name: item.name,
-          value: '[Error: Unable to get env vars]',
-          is_secret: item.is_secret,
-          updated_at: item.updated_at,
-        };
-      }
+      return {
+        ...item,
+        value: item.is_secret ? '********' : item.value,
+      };
     }),
   );
 }
+
+export async function decryptSecretWithPrivateKey(
+  encryptedText: string,
+  privateKey: string,
+): Promise<SAPayload<{ decrypted: string }>> {
+  const formattedPrivateKey = privateKey
+    ? formatKey(privateKey, 'private')
+    : '';
+  const buffer = Buffer.from(encryptedText, 'base64');
+  const decrypted = privateDecrypt(
+    {
+      key: formattedPrivateKey,
+      padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
+      oaepHash: 'sha256',
+    },
+    buffer,
+  );
+  return {
+    status: 'success',
+    data: {
+      decrypted: decrypted.toString('utf8'),
+    },
+  };
+}
+
+export async function bulkUpdateTFVars(
+  bulkEditValue: string,
+  projectId: string,
+  orgId: string,
+): Promise<SAPayload<EnvVar[]>> {
+  try {
+    const parsedVars = JSON.parse(bulkEditValue);
+    if (!Array.isArray(parsedVars)) {
+      throw new Error('Invalid JSON format. Expected an array of variables.');
+    }
+
+    const names = parsedVars.map((v: { name: string; value: string }) =>
+      v.name.toLowerCase(),
+    );
+    if (new Set(names).size !== names.length) {
+      throw new Error('Duplicate variable names are not allowed');
+    }
+
+    const response = await tfvarsOnBulkUpdate(parsedVars, projectId, orgId);
+
+    if (response.status === 'error') {
+      throw new Error(response.message);
+    }
+
+    revalidatePath(`/project/${projectId}`);
+
+    return {
+      status: 'success',
+      data: response.data,
+    };
+  } catch (error) {
+    return {
+      status: 'error',
+      message:
+        error instanceof Error ? error.message : 'An unknown error occurred',
+    };
+  }
+}
diff --git a/src/data/user/tfvars.ts b/src/data/user/tfvars.ts
index b8c0cc6d..54f33dc0 100644
--- a/src/data/user/tfvars.ts
+++ b/src/data/user/tfvars.ts
@@ -1,6 +1,7 @@
 // tfvars.ts
 'use server';
 
+import { SAPayload } from '@/types';
 import { EnvVar } from '@/types/userTypes';
 import { deleteEnvVar, getAllEnvVars, storeEnvVar } from '../admin/env-vars';
 
@@ -33,7 +34,7 @@ export async function tfvarsOnBulkUpdate(
   vars: EnvVar[],
   projectId: string,
   orgId: string,
-): Promise<EnvVar[]> {
+): Promise<SAPayload<EnvVar[]>> {
   const currentVars = await getAllEnvVars(projectId);
   const currentVarsMap = Object.fromEntries(
     currentVars.map((v) => [v.name, v]),
@@ -77,8 +78,11 @@ export async function tfvarsOnBulkUpdate(
   }
 
   const updatedVars = await getAllEnvVars(projectId);
-  return updatedVars.map((v) => ({
-    ...v,
-    updated_at: new Date().toISOString(),
-  }));
+  return {
+    status: 'success',
+    data: updatedVars.map((v) => ({
+      ...v,
+      updated_at: new Date().toISOString(),
+    })),
+  };
 }
diff --git a/src/types/userTypes.ts b/src/types/userTypes.ts
index 3a7e0486..bfe3911e 100644
--- a/src/types/userTypes.ts
+++ b/src/types/userTypes.ts
@@ -7,6 +7,7 @@ export type UserRoles = {
 export type UserRole = UserRoles[keyof UserRoles];
 
 export type EnvVar = {
+  id: string;
   name: string;
   value: string;
   is_secret: boolean;
diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts
new file mode 100644
index 00000000..8dd36545
--- /dev/null
+++ b/src/utils/crypto.ts
@@ -0,0 +1,53 @@
+import crypto from 'crypto';
+
+export function encryptWithPublicKey(text: string, publicKey: string) {
+  const buffer = Buffer.from(text, 'utf8');
+  const encrypted = crypto.publicEncrypt(
+    {
+      key: publicKey,
+      padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
+      oaepHash: 'sha256',
+    },
+    buffer,
+  );
+  return encrypted.toString('base64');
+}
+
+export function decryptWithPrivateKey(
+  encryptedText: string,
+  privateKey: string,
+) {
+  const buffer = Buffer.from(encryptedText, 'base64');
+  const decrypted = crypto.privateDecrypt(
+    {
+      key: privateKey,
+      padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
+      oaepHash: 'sha256',
+    },
+    buffer,
+  );
+  return decrypted.toString('utf8');
+}
+
+export function formatKey(key: string, type: 'public' | 'private'): string {
+  const header =
+    type === 'public'
+      ? '-----BEGIN PUBLIC KEY-----'
+      : '-----BEGIN PRIVATE KEY-----';
+  const footer =
+    type === 'public'
+      ? '-----END PUBLIC KEY-----'
+      : '-----END PRIVATE KEY-----';
+
+  // Remove any existing headers and footers
+  let cleanedKey = key.replace(
+    /-----BEGIN (PUBLIC|PRIVATE) KEY-----|-----END (PUBLIC|PRIVATE) KEY-----/g,
+    '',
+  );
+
+  // Replace '\n' with actual newlines and remove any extra whitespace
+  cleanedKey = cleanedKey.replace(/\\n/g, '\n').replace(/\s+/g, '\n').trim();
+
+  // Ensure the key is in the correct format
+  return `${header}\n${cleanedKey}\n${footer}`;
+}