diff --git a/plugins/lando-core/scripts/add-cert.sh b/plugins/lando-core/scripts/add-cert.sh
index 51d610491..7517e28ca 100755
--- a/plugins/lando-core/scripts/add-cert.sh
+++ b/plugins/lando-core/scripts/add-cert.sh
@@ -99,7 +99,7 @@ lando_info ""
 
 lando_info "Generating certs..."
 openssl genrsa -out /certs/cert.key 2048
-openssl req -new -key /certs/cert.key -out /certs/cert.csr -subj "/C=US/ST=California/L=San Francisco/O=Lando/OU=Bespin/CN=${COMMON_NAME}"
+openssl req -new -key /certs/cert.key -out /certs/cert.csr -subj "/C=US/ST=California/L=San Francisco/O=Automattic/OU=WPVIP/CN=${COMMON_NAME}"
 openssl x509 \
   -req \
   -in /certs/cert.csr \
diff --git a/plugins/lando-core/scripts/setup-ca.sh b/plugins/lando-core/scripts/setup-ca.sh
index 0fb852f19..23d2126a6 100755
--- a/plugins/lando-core/scripts/setup-ca.sh
+++ b/plugins/lando-core/scripts/setup-ca.sh
@@ -50,7 +50,7 @@ if [ ! -f "$LANDO_CA_CERT" ]; then
     -sha256 \
     -days 8675 \
     -out $LANDO_CA_CERT \
-    -subj "/C=US/ST=California/L=San Francisco/O=Lando/OU=Bespin/CN=Lando Local CA"
+    -subj "/C=US/ST=California/L=San Francisco/O=Automattic/OU=WPVIP/CN=WPVIP Local CA"
   # Set the cert and key on host to host-uid/gid ownership
   chown "$LANDO_HOST_UID:$LANDO_HOST_GID" "$LANDO_CA_KEY"
   chown "$LANDO_HOST_UID:$LANDO_HOST_GID" "$LANDO_CA_CERT"