diff --git a/internal/clis/hmpki/generate.go b/internal/clis/hmpki/generate.go
index 2a40a02..9bf9d8e 100644
--- a/internal/clis/hmpki/generate.go
+++ b/internal/clis/hmpki/generate.go
@@ -8,6 +8,9 @@ import (
 var Name string
 var OutDir string
 
+// Needed by all subcommands that generate certificates.
+var CommonName string
+
 func init() {
 	rootCmd.AddCommand(generateCmd)
 
@@ -17,7 +20,7 @@ func init() {
 		"name",
 		"n",
 		"",
-		"name of the artifact being benerated",
+		"name of the artifact being generated",
 	)
 	generateCmd.MarkPersistentFlagRequired("name")
 
diff --git a/internal/clis/hmpki/generate_ca.go b/internal/clis/hmpki/generate_ca.go
index 4259a63..ae631f9 100644
--- a/internal/clis/hmpki/generate_ca.go
+++ b/internal/clis/hmpki/generate_ca.go
@@ -17,6 +17,14 @@ import (
 
 func init() {
 	generateCmd.AddCommand(generateCACmd)
+
+	generateCACmd.Flags().StringVar(
+		&CommonName,
+		"common-name",
+		"",
+		"Common Name for the CA",
+	)
+	generateCACmd.MarkFlagRequired("common-name")
 }
 
 var generateCACmd = &cobra.Command{
@@ -35,7 +43,7 @@ var generateCACmd = &cobra.Command{
 			SerialNumber: sn,
 			Subject: pkix.Name{
 				// TODO: Accept common name as a flag.
-				CommonName: "Some Common Name",
+				CommonName: CommonName,
 			},
 			// Valid starting now and for 10 years.
 			NotBefore: time.Now(),
@@ -77,7 +85,6 @@ var generateCACmd = &cobra.Command{
 			return err
 		}
 
-		// Write ca.crt to Output
 		return nil
 	},
 }