diff --git a/cli/src/main.rs b/cli/src/main.rs
index 54f625d..8b0299b 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -100,8 +100,8 @@ fn parse_timestamp(timestamp: &str) -> Result<DateTime<Utc>> {
 
 fn create_key_pair(key_pair_path: &Path) -> Result<()> {
     let key_pair = gcert::create_key_pair();
-    save_json_with_extension(key_pair_path, &key_pair.public_key, "pub")?;
-    save_json_with_extension(key_pair_path, &key_pair.private_key, "key")
+    save_json_with_extension(key_pair_path, &key_pair.public_key, "pub.json")?;
+    save_json_with_extension(key_pair_path, &key_pair.private_key, "key.json")
 }
 
 fn print_fingerprint(input_file_path: &Path) -> Result<()> {
diff --git a/cli/src/ui/certificate.rs b/cli/src/ui/certificate.rs
index dda0323..b7977fa 100644
--- a/cli/src/ui/certificate.rs
+++ b/cli/src/ui/certificate.rs
@@ -166,7 +166,7 @@ impl DocumentEditor for CertificateEditor {
             subject: Some(self.subject_editor.get_subject()),
             validity_period: Some(self.validity_period_editor.get_validity_period()),
         };
-        json!({ "certificate": certificate })
+        json!({ "$schema": SIGNED_CERTIFICATE_SCHEMA_ID, "certificate": certificate })
     }
 
     fn create_signed_document(