diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs b/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
index c61e3f845c..aa4d19381b 100644
--- a/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
+++ b/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 -- | Shelley CLI command types
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
index 155c1aefbb..86c7587af9 100644
--- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -1210,6 +1210,47 @@ Usage: cardano-cli stake-address pool-delegation-certificate
 
   Create a stake address pool delegation certificate
 
+Usage: cardano-cli ccm 
+            (key-gen | key-gen-VRF | key-hash-VRF | new-counter | issue-op-cert)
+
+  CCM operation commands
+
+Usage: cardano-cli ccm key-gen --cold-verification-key-file FILE
+            --cold-signing-key-file FILE
+            --operational-certificate-issue-counter-file FILE
+
+  Create a key pair for a CCM's offline key and a new certificate issue counter
+
+Usage: cardano-cli ccm key-gen-VRF --verification-key-file FILE
+            --signing-key-file FILE
+
+  Create a key pair for a CCM VRF operational key
+
+Usage: cardano-cli ccm key-hash-VRF 
+            (--verification-key STRING | --verification-key-file FILE)
+            [--out-file FILE]
+
+  Print hash of a CCM's operational VRF key.
+
+Usage: cardano-cli ccm new-counter 
+            ( --stake-pool-verification-key STRING
+            | --genesis-delegate-verification-key STRING
+            | --cold-verification-key-file FILE
+            )
+            --counter-value INT
+            --operational-certificate-issue-counter-file FILE
+
+  Create a new certificate issue counter
+
+Usage: cardano-cli ccm issue-op-cert 
+            (--kes-verification-key STRING | --kes-verification-key-file FILE)
+            --cold-signing-key-file FILE
+            --operational-certificate-issue-counter-file FILE
+            --kes-period NATURAL
+            --out-file FILE
+
+  Issue a CCM operational certificate
+
 Usage: cardano-cli address (key-gen | key-hash | build | info)
 
   Payment address commands
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm.cli
new file mode 100644
index 0000000000..4d3a7d56ef
--- /dev/null
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm.cli
@@ -0,0 +1,15 @@
+Usage: cardano-cli ccm 
+            (key-gen | key-gen-VRF | key-hash-VRF | new-counter | issue-op-cert)
+
+  CCM operation commands
+
+Available options:
+  -h,--help                Show this help text
+
+Available commands:
+  key-gen                  Create a key pair for a CCM's offline key and a new
+                           certificate issue counter
+  key-gen-VRF              Create a key pair for a CCM VRF operational key
+  key-hash-VRF             Print hash of a CCM's operational VRF key.
+  new-counter              Create a new certificate issue counter
+  issue-op-cert            Issue a CCM operational certificate
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_issue-op-cert.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_issue-op-cert.cli
new file mode 100644
index 0000000000..ab5843f3ea
--- /dev/null
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_issue-op-cert.cli
@@ -0,0 +1,22 @@
+Usage: cardano-cli ccm issue-op-cert 
+            (--kes-verification-key STRING | --kes-verification-key-file FILE)
+            --cold-signing-key-file FILE
+            --operational-certificate-issue-counter-file FILE
+            --kes-period NATURAL
+            --out-file FILE
+
+  Issue a CCM operational certificate
+
+Available options:
+  --kes-verification-key STRING
+                           A Bech32 or hex-encoded hot KES verification key.
+  --kes-verification-key-file FILE
+                           Filepath of the hot KES verification key.
+  --cold-signing-key-file FILE
+                           Filepath of the cold signing key.
+  --operational-certificate-issue-counter-file FILE
+                           The file with the issue counter for the operational
+                           certificate.
+  --kes-period NATURAL     The start of the KES key validity period.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-gen-VRF.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-gen-VRF.cli
new file mode 100644
index 0000000000..2d752125eb
--- /dev/null
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-gen-VRF.cli
@@ -0,0 +1,10 @@
+Usage: cardano-cli ccm key-gen-VRF --verification-key-file FILE
+            --signing-key-file FILE
+
+  Create a key pair for a CCM VRF operational key
+
+Available options:
+  --verification-key-file FILE
+                           Output filepath of the verification key.
+  --signing-key-file FILE  Output filepath of the signing key.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-gen.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-gen.cli
new file mode 100644
index 0000000000..f5583cdc47
--- /dev/null
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-gen.cli
@@ -0,0 +1,15 @@
+Usage: cardano-cli ccm key-gen --cold-verification-key-file FILE
+            --cold-signing-key-file FILE
+            --operational-certificate-issue-counter-file FILE
+
+  Create a key pair for a CCM's offline key and a new certificate issue counter
+
+Available options:
+  --cold-verification-key-file FILE
+                           Filepath of the cold verification key.
+  --cold-signing-key-file FILE
+                           Filepath of the cold signing key.
+  --operational-certificate-issue-counter-file FILE
+                           The file with the issue counter for the operational
+                           certificate.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-hash-VRF.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-hash-VRF.cli
new file mode 100644
index 0000000000..f30c78545c
--- /dev/null
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_key-hash-VRF.cli
@@ -0,0 +1,13 @@
+Usage: cardano-cli ccm key-hash-VRF 
+            (--verification-key STRING | --verification-key-file FILE)
+            [--out-file FILE]
+
+  Print hash of a CCM's operational VRF key.
+
+Available options:
+  --verification-key STRING
+                           Verification key (Bech32 or hex-encoded).
+  --verification-key-file FILE
+                           Input filepath of the verification key.
+  --out-file FILE          Optional output file. Default is to write to stdout.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_new-counter.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_new-counter.cli
new file mode 100644
index 0000000000..917d5ce6fb
--- /dev/null
+++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/ccm_new-counter.cli
@@ -0,0 +1,22 @@
+Usage: cardano-cli ccm new-counter 
+            ( --stake-pool-verification-key STRING
+            | --genesis-delegate-verification-key STRING
+            | --cold-verification-key-file FILE
+            )
+            --counter-value INT
+            --operational-certificate-issue-counter-file FILE
+
+  Create a new certificate issue counter
+
+Available options:
+  --stake-pool-verification-key STRING
+                           Stake pool verification key (Bech32 or hex-encoded).
+  --genesis-delegate-verification-key STRING
+                           Genesis delegate verification key (hex-encoded).
+  --cold-verification-key-file FILE
+                           Filepath of the cold verification key.
+  --counter-value INT      The next certificate issue counter value to use.
+  --operational-certificate-issue-counter-file FILE
+                           The file with the issue counter for the operational
+                           certificate.
+  -h,--help                Show this help text