diff --git a/backend/src/services/certificate-authority/certificate-authority-service.ts b/backend/src/services/certificate-authority/certificate-authority-service.ts
index 8d1d7f9cd..67903b265 100644
--- a/backend/src/services/certificate-authority/certificate-authority-service.ts
+++ b/backend/src/services/certificate-authority/certificate-authority-service.ts
@@ -1423,7 +1423,6 @@ export const certificateAuthorityServiceFactory = ({
       kmsService
     });
 
-    // TODO(andrey): Might need tweaks after other PR merge
     return {
       certificate: leafCert.toString("pem"),
       certificateChain: `${issuingCaCertificate}\n${caCertChain}`.trim(),
@@ -1816,7 +1815,6 @@ export const certificateAuthorityServiceFactory = ({
       kmsService
     });
 
-    // TODO(andrey): Might need tweaks after other PR merge
     return {
       certificate: leafCert,
       certificateChain: `${issuingCaCertificate}\n${caCertChain}`.trim(),
diff --git a/backend/src/services/certificate/certificate-service.ts b/backend/src/services/certificate/certificate-service.ts
index ae3a96d60..5b1f30c8a 100644
--- a/backend/src/services/certificate/certificate-service.ts
+++ b/backend/src/services/certificate/certificate-service.ts
@@ -207,7 +207,7 @@ export const certificateServiceFactory = ({
 
     let certificateChain = null;
 
-    // TODO(andrey): Update this after the "store cert chain on cert body" PR gets merged
+    // TODO(andrey): Update this to get certificateChain straight from the certificate body after the "store cert chain on cert body" PR gets merged
     if (cert.caCertId) {
       const { caCert, caCertChain } = await getCaCertChain({
         caCertId: cert.caCertId,