diff --git a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
index 88e5a3f1a..c8ee6dc45 100755
--- a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
+++ b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
@@ -49,10 +49,12 @@ function detect_certificate_type() {
 	let issuer = pipe.read("all");
 	pipe.close();
 
-	if (!match(issuer, /Telecom Infra Project Issuing CA/)) {
+	if (match(issuer, /OpenLAN Demo Birth CA/)) {
 		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
 		cds_server = 'discovery-qa.open-lan.org';
 		timeouts.expiry_threshold = 3 * 24 * 60 * 60;
+	} else if (match(issuer, /OpenLAN Birth Issuing CA/)) {
+		ulog(LOG_INFO, 'Certificate type is "Production"\n');
 	} else {
 		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
 	}
diff --git a/feeds/tip/cloud_discovery/files/usr/bin/est_client b/feeds/tip/cloud_discovery/files/usr/bin/est_client
index 22ba0f726..6102efbae 100755
--- a/feeds/tip/cloud_discovery/files/usr/bin/est_client
+++ b/feeds/tip/cloud_discovery/files/usr/bin/est_client
@@ -16,9 +16,11 @@ function set_est_server() {
 	let issuer = pipe.read("all");
 	pipe.close();
 
-	if (!match(issuer, /Telecom Infra Project Issuing CA/)) {
+	if (match(issuer, /OpenLAN Demo Birth CA/)) {
 		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
 		est_server = 'qaest.certificates.open-lan.org:8001';
+	} else if (match(issuer, /OpenLAN Birth Issuing CA/)) {
+		ulog(LOG_INFO, 'Certificate type is "Production"\n');
 	} else {
 		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
 	}