diff --git a/services/nats/generate_cert.sh b/services/nats/generate_cert.sh
index 071f9df..4c4dd0b 100755
--- a/services/nats/generate_cert.sh
+++ b/services/nats/generate_cert.sh
@@ -16,7 +16,7 @@ CLI_KEY=$WORKDIR/client-key.pem
 CLI_REQ=$WORKDIR/client-req.csr
 CLI_CRT=$WORKDIR/client-cert.pem
 
-SUBJ="/O=NSPCC"
+SUBJ="/O=TrueCloudLab"
 
 if [[ ! -f $CA_KEY || ! -f $CA_CRT ]]; then
 	openssl req -newkey rsa:4096 -x509 -days 365 -nodes -keyout $CA_KEY -out $CA_CRT -subj $SUBJ 2>&1 ||
diff --git a/services/storage/generate_cert.sh b/services/storage/generate_cert.sh
index ddc7aa1..87672d2 100755
--- a/services/storage/generate_cert.sh
+++ b/services/storage/generate_cert.sh
@@ -19,7 +19,7 @@ if [[ ! -f ${CERT} ]]; then
         ) > ${SSL_CONFIG}
 
         openssl req -new -newkey rsa:4096 -x509 -sha256 -days 365 -nodes \
-        -subj "/C=RU/ST=SPB/L=St.Petersburg/O=NSPCC/OU=NSPCC/CN=s04.${LOCAL_DOMAIN}" \
+        -subj "/C=RU/ST=SPB/L=St.Petersburg/O=TrueCloudLab/OU=TrueCloudLab/CN=s04.${LOCAL_DOMAIN}" \
         -keyout "${KEY}" -out "${CERT}" -extensions san -config "${SSL_CONFIG}" &> /dev/null || {
             die "Failed to generate SSL certificate for s04"
         }