diff --git a/docker-compose.yml b/docker-compose.yml
index ced5b42b..e1622c65 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,14 +107,15 @@ services:
         rm -rf /tmp/sztpd-simulator
         curl -kL https://watsen.net/support/sztpd-simulator-0.0.11.tgz | tar -zxvf - -C /tmp/
         cd /tmp/sztpd-simulator/pki
+        echo === SERVER SBI certificates ===
         echo "DNS.2 = bootstrap" >> sztpd1/sbi/end-entity/openssl.cnf
         echo "DNS.3 = web" >> sztpd1/sbi/end-entity/openssl.cnf
         echo "DNS.4 = redirecter" >> sztpd1/sbi/end-entity/openssl.cnf
-        make pki SHELL=/bin/ash
-        echo === SERVER SBI certificates ===
+        make -C sztpd1/sbi pki SHELL=/bin/ash
         cat sztpd1/sbi/end-entity/my_cert.pem sztpd1/sbi/intermediate2/my_cert.pem > /tmp/cert_chain.pem
         openssl crl2pkcs7 -nocrl -certfile /tmp/cert_chain.pem -outform DER -out /tmp/cert_chain.cms
         echo === CLIENT cert DevID trust anchor ===
+        make -C client pki SHELL=/bin/ash
         cat client/root-ca/my_cert.pem client/intermediate1/my_cert.pem client/intermediate2/my_cert.pem > /tmp/ta_cert_chain.pem
         openssl crl2pkcs7 -nocrl -certfile /tmp/ta_cert_chain.pem -outform DER -out /tmp/ta_cert_chain.cms
         echo === COPY TO FINAL DESTINATION ===
diff --git a/sztp-agent/pkg/secureagent/daemon.go b/sztp-agent/pkg/secureagent/daemon.go
index 662475f7..a9bc6e2a 100644
--- a/sztp-agent/pkg/secureagent/daemon.go
+++ b/sztp-agent/pkg/secureagent/daemon.go
@@ -84,7 +84,7 @@ func (a *Agent) getBootstrapURL() error {
 		}
 		a.SetBootstrapURL(extractfromLine(line, `(?m)[^"]*`, 1))
 	} else {
-		log.Printf(" File " + a.DhcpLeaseFile + " does not exist\n")
+		log.Printf("[ERROR] File " + a.DhcpLeaseFile + " does not exist\n")
 		return errors.New(" File " + a.DhcpLeaseFile + " does not exist\n")
 	}
 	log.Println("[INFO] Bootstrap URL retrieved successfully: " + a.GetBootstrapURL())
diff --git a/sztp-agent/pkg/secureagent/utils.go b/sztp-agent/pkg/secureagent/utils.go
index 9e0528f4..fcae9127 100644
--- a/sztp-agent/pkg/secureagent/utils.go
+++ b/sztp-agent/pkg/secureagent/utils.go
@@ -127,7 +127,7 @@ func GetSerialNumber(givenSerialNumber string) string {
 	serialNumber := ""
 	product, err := ghw.Product()
 	if err != nil {
-		log.Printf("Error getting products info: %v", err)
+		log.Printf("[ERROR] Error getting products info: %v", err)
 	} else {
 		serialNumber = product.SerialNumber
 	}
@@ -141,7 +141,7 @@ func generateInputJSONContent() string {
 	hwModel := ""
 	baseboard, err := ghw.Baseboard()
 	if err != nil {
-		log.Printf("Error getting baseboard info: %v", err)
+		log.Printf("[ERROR] Error getting baseboard info: %v", err)
 	} else {
 		hwModel = baseboard.Product
 	}