diff --git a/util/Setup/CertBuilder.cs b/util/Setup/CertBuilder.cs
index 9a729fea8..d4103ef63 100644
--- a/util/Setup/CertBuilder.cs
+++ b/util/Setup/CertBuilder.cs
@@ -43,7 +43,7 @@ namespace Bit.Setup
                     _context.Config.Ssl = true;
                     _context.Install.Trusted = false;
                     _context.Install.SelfSignedCert = true;
-                    Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -days 365 " +
+                    Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -days 36500 " +
                         $"-keyout /bitwarden/ssl/self/{_context.Install.Domain}/private.key " +
                         $"-out /bitwarden/ssl/self/{_context.Install.Domain}/certificate.crt " +
                         $"-reqexts SAN -extensions SAN " +
@@ -70,7 +70,7 @@ namespace Bit.Setup
             _context.Install.IdentityCertPassword = Helpers.SecureRandomString(32, alpha: true, numeric: true);
             Directory.CreateDirectory("/bitwarden/identity/");
             Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout identity.key " +
-                "-out identity.crt -subj \"/CN=Bitwarden IdentityServer\" -days 10950");
+                "-out identity.crt -subj \"/CN=Bitwarden IdentityServer\" -days 36500");
             Helpers.Exec("openssl pkcs12 -export -out /bitwarden/identity/identity.pfx -inkey identity.key " +
                 $"-in identity.crt -certfile identity.crt -passout pass:{_context.Install.IdentityCertPassword}");