diff --git a/src/components/admin/ArchiveManagementTable.tsx b/src/components/admin/ArchiveManagementTable.tsx
index 64a48df..2618130 100644
--- a/src/components/admin/ArchiveManagementTable.tsx
+++ b/src/components/admin/ArchiveManagementTable.tsx
@@ -23,6 +23,7 @@ interface CaCertificate {
   status: string;
   is_latest: boolean;
   issuer_name?: string;
+  issuer_serial?: string;
 }
 
 interface ArchiveManagementTableProps {
@@ -109,15 +110,16 @@ export default function ArchiveManagementTable({
                     </div>
                   </TableCell>
                   <TableCell className="px-5 py-4 text-start">
-                    {cert.issuer_name === "Self-Signed" ? (
-                      <Badge size="sm" color="info" variant="outline" className="text-[10px]">
-                        {t("self_signed")}
-                      </Badge>
-                    ) : (
-                      <span className="text-[10px] text-gray-600 dark:text-gray-400 italic">
+                    <div className="flex flex-col">
+                      <span className="text-[10px] text-gray-700 dark:text-gray-300 font-medium">
                         {cert.issuer_name || "-"}
                       </span>
-                    )}
+                      {cert.issuer_serial && (
+                        <span className="text-[9px] text-gray-400 font-mono italic leading-tight">
+                          {cert.issuer_serial}
+                        </span>
+                      )}
+                    </div>
                   </TableCell>
                   <TableCell className="px-5 py-4 text-start text-theme-xs text-gray-500 dark:text-gray-400">
                     <div className="flex flex-col">
diff --git a/src/components/admin/RootCaTable.tsx b/src/components/admin/RootCaTable.tsx
index 841ae04..8939001 100644
--- a/src/components/admin/RootCaTable.tsx
+++ b/src/components/admin/RootCaTable.tsx
@@ -22,6 +22,7 @@ interface CaCertificate {
   valid_to: string;
   status: string;
   issuer_name?: string;
+  issuer_serial?: string;
 }
 
 interface RootCaTableProps {
@@ -108,15 +109,16 @@ export default function RootCaTable({
                     {cert.common_name}
                   </TableCell>
                   <TableCell className="px-5 py-4 text-start">
-                    {cert.issuer_name === "Self-Signed" ? (
-                      <Badge size="sm" color="info" variant="outline">
-                        {t("self_signed")}
-                      </Badge>
-                    ) : (
-                      <span className="text-theme-sm text-gray-600 dark:text-gray-400 italic">
+                    <div className="flex flex-col">
+                      <span className="text-theme-sm text-gray-700 dark:text-gray-300 font-medium">
                         {cert.issuer_name || "-"}
                       </span>
-                    )}
+                      {cert.issuer_serial && (
+                        <span className="text-[10px] text-gray-400 font-mono italic">
+                          {cert.issuer_serial}
+                        </span>
+                      )}
+                    </div>
                   </TableCell>
                   <TableCell className="px-5 py-4 text-start font-mono text-theme-xs text-gray-500 dark:text-gray-400">
                     {cert.serial_number}