diff --git a/sztp.md b/sztp.md
index 9b95fa6..f2e3cf6 100644
--- a/sztp.md
+++ b/sztp.md
@@ -74,5 +74,9 @@ docker run --rm -it --network=host \
   --mount type=bind,source=/etc/os-release,target=/etc/os-release \
   --mount type=bind,source=${DHCLIENT_LEASE_FILE},target=/var/lib/dhclient/dhclient.leases \
   ghcr.io/opiproject/opi-sztp-client:main \
-  /opi-sztp-agent daemon --bootstrap-trust-anchor-cert /mnt/opi.pem --device-end-entity-cert /mnt/opi_cert.pem --device-private-key /mnt/opi_private_key.pem
+  /opi-sztp-agent daemon \
+  --bootstrap-trust-anchor-cert /mnt/opi.pem \
+  --device-end-entity-cert /mnt/opi_cert.pem \
+  --device-private-key /mnt/opi_private_key.pem \
+  --serial-number nvidia-serial-number
 ```
diff --git a/sztp/key.sh b/sztp/key.sh
index 0d4d101..1f1524c 100755
--- a/sztp/key.sh
+++ b/sztp/key.sh
@@ -10,6 +10,7 @@ pushd ${MYTMPDIR}/sztpd-simulator/pki
 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
+sed -i 's/my-serial-number/nvidia-serial-number/g' client/end-entity/openssl.cnf
 make pki
 # SBI Port certificates
 cat sztpd1/sbi/end-entity/my_cert.pem sztpd1/sbi/intermediate2/my_cert.pem > ${MYTMPDIR}/sztpd-simulator/cert_chain.pem
diff --git a/sztp/template.json b/sztp/template.json
index d855e7f..130276c 100644
--- a/sztp/template.json
+++ b/sztp/template.json
@@ -107,7 +107,7 @@
   "wn-sztpd-1:devices": {
     "device": [
       {
-        "serial-number": "my-serial-number",
+        "serial-number": "nvidia-serial-number",
         "device-type": "my-device-type",
         "activation-code": "$0$my-secret",
         "response-manager": {