diff --git a/certidude/cli.py b/certidude/cli.py
index bdfeab0..2fae86c 100755
--- a/certidude/cli.py
+++ b/certidude/cli.py
@@ -269,6 +269,10 @@ def certidude_enroll(fork, renew, no_wait, kerberos, skip_self):
             click.echo("No common name specified for %s, not requesting a certificate" % authority_name)
             continue
 
+        # If deriving common name from *current* hostname is preferred
+        if common_name == "$HOSTNAME":
+            common_name = const.HOSTNAME
+
         ################################
         ### Generate keypair and CSR ###
         ################################