diff --git a/cmd/collectors/zapi/plugins/certificate/certificate.go b/cmd/collectors/zapi/plugins/certificate/certificate.go
index b5ae1d7fb..e1665f822 100644
--- a/cmd/collectors/zapi/plugins/certificate/certificate.go
+++ b/cmd/collectors/zapi/plugins/certificate/certificate.go
@@ -93,14 +93,14 @@ func (my *Certificate) Run(data *matrix.Matrix) ([]*matrix.Matrix, error) {
 		}
 
 		// update certificate instance based on admin vaserver serial
-		for _, certificateInstance := range data.GetInstances() {
+		for certificateInstanceKey, certificateInstance := range data.GetInstances() {
 			if certificateInstance.IsExportable() {
 				certificateInstance.SetExportable(false)
 				serialNumber := certificateInstance.GetLabel("serial_number")
 
 				if serialNumber == adminVserverSerial {
 					certificateInstance.SetExportable(true)
-					my.setCertificateIssuerType(certificateInstance)
+					my.setCertificateIssuerType(certificateInstance, certificateInstanceKey)
 					my.setCertificateValidity(data, certificateInstance)
 				}
 			}
@@ -112,17 +112,16 @@ func (my *Certificate) Run(data *matrix.Matrix) ([]*matrix.Matrix, error) {
 	return nil, nil
 }
 
-func (my *Certificate) setCertificateIssuerType(instance *matrix.Instance) {
+func (my *Certificate) setCertificateIssuerType(instance *matrix.Instance, certificateInstanceKey string) {
 	var (
 		cert *x509.Certificate
 		err  error
 	)
 
 	certificatePEM := instance.GetLabel("certificatePEM")
-	certUUID := instance.GetLabel("uuid")
 
 	if certificatePEM == "" {
-		my.Logger.Debug().Str("uuid", certUUID).Msg("Certificate is not found")
+		my.Logger.Debug().Str("certificateInstanceKey", certificateInstanceKey).Msg("Certificate is not found")
 		instance.SetLabel("certificateIssuerType", "unknown")
 	} else {
 		instance.SetLabel("certificateIssuerType", "self_signed")
diff --git a/conf/rest/9.12.0/security_certificate.yaml b/conf/rest/9.12.0/security_certificate.yaml
index c34f13439..c292d87de 100644
--- a/conf/rest/9.12.0/security_certificate.yaml
+++ b/conf/rest/9.12.0/security_certificate.yaml
@@ -17,9 +17,6 @@ counters:
       - type="server"
 
 plugins:
-  - LabelAgent:
-      value_to_num:
-        - status name - - `0`
   - Certificate:
       schedule:
         - data: 180s  # should be multiple of data poll duration
diff --git a/conf/zapi/cdot/9.8.0/security_certificate.yaml b/conf/zapi/cdot/9.8.0/security_certificate.yaml
index e0f1725f8..697cf1472 100644
--- a/conf/zapi/cdot/9.8.0/security_certificate.yaml
+++ b/conf/zapi/cdot/9.8.0/security_certificate.yaml
@@ -16,8 +16,6 @@ plugins:
   - LabelAgent:
       include_equals:
         - type `server`
-      value_to_num:
-        - status name - - `0`
   - Certificate:
       schedule:
         - data: 180s  # should be multiple of data poll duration