diff --git a/src/Admin/Views/Shared/_Layout.cshtml b/src/Admin/Views/Shared/_Layout.cshtml
index 92f73d7ca..c88c444df 100644
--- a/src/Admin/Views/Shared/_Layout.cshtml
+++ b/src/Admin/Views/Shared/_Layout.cshtml
@@ -89,7 +89,7 @@
 
     <footer class="container mb-4">
         <hr />
-        &copy; @DateTime.Now.Year, 8bit Solutions LLC
+        &copy; @DateTime.Now.Year, Bitwarden Inc.
     </footer>
 
     <environment include="Development">
diff --git a/util/Setup/CertBuilder.cs b/util/Setup/CertBuilder.cs
index d4103ef63..fbf4aa656 100644
--- a/util/Setup/CertBuilder.cs
+++ b/util/Setup/CertBuilder.cs
@@ -48,7 +48,7 @@ namespace Bit.Setup
                         $"-out /bitwarden/ssl/self/{_context.Install.Domain}/certificate.crt " +
                         $"-reqexts SAN -extensions SAN " +
                         $"-config <(cat /usr/lib/ssl/openssl.cnf <(printf '[SAN]\nsubjectAltName=DNS:{_context.Install.Domain}\nbasicConstraints=CA:true')) " +
-                        $"-subj \"/C=US/ST=Florida/L=Jacksonville/O=8bit Solutions LLC/OU=Bitwarden/CN={_context.Install.Domain}\"");
+                        $"-subj \"/C=US/ST=California/L=Santa Barbara/O=Bitwarden Inc./OU=Bitwarden/CN={_context.Install.Domain}\"");
                 }
             }