diff --git a/operatorapi/operator_tenants.go b/operatorapi/operator_tenants.go
index a406569de..54892ad55 100644
--- a/operatorapi/operator_tenants.go
+++ b/operatorapi/operator_tenants.go
@@ -678,7 +678,7 @@ func parseCertificate(name string, rawCert []byte) (*models.CertificateInfo, err
 		SerialNumber: cert.SerialNumber.String(),
 		Name:         name,
 		Domains:      domains,
-		Expiry:       cert.NotAfter.String(),
+		Expiry:       cert.NotAfter.Format(time.RFC3339),
 	}, nil
 }
 
@@ -722,7 +722,7 @@ func parseTenantCertificates(ctx context.Context, clientSet K8sClientI, namespac
 				SerialNumber: cert.SerialNumber.String(),
 				Name:         secret.Name,
 				Domains:      domains,
-				Expiry:       cert.NotAfter.String(),
+				Expiry:       cert.NotAfter.Format(time.RFC3339),
 			})
 		}
 	}
diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx
index f9c6333f2..b99c3ecff 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx
@@ -246,7 +246,7 @@ const Security = ({
                       <Grid
                         item
                         xs={12}
-                        key={keyPair.id}
+                        key={`minio-certs-${keyPair.id}`}
                         className={classes.minioCertificateRows}
                       >
                         <Grid item xs={10} className={classes.fileItem}>
@@ -316,7 +316,7 @@ const Security = ({
                       <Grid
                         item
                         xs={12}
-                        key={keyPair.id}
+                        key={`minio-CA-certs-${keyPair.id}`}
                         className={classes.minioCACertsRow}
                       >
                         <Grid item xs={6}>
diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx
index 6dec700c8..8daeab55f 100644
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx
@@ -414,7 +414,7 @@ const TenantSecurity = ({
                             >
                               {certificateInfo.domains &&
                                 certificateInfo.domains.map((dom) => {
-                                  return <div>{dom}</div>;
+                                  return <div key={`domain-${dom}`}>{dom}</div>;
                                 })}
                             </Typography>
                             <Typography
@@ -534,7 +534,7 @@ const TenantSecurity = ({
                             >
                               {certificateInfo.domains &&
                                 certificateInfo.domains.map((dom) => {
-                                  return <div>{dom}</div>;
+                                  return <div key={`CA-domain-${dom}`}>{dom}</div>;
                                 })}
                             </Typography>
                             <Typography