diff --git a/website/versioned_docs/version-v2.0_alpha/developers-references/typescript-code/cli.md b/website/versioned_docs/version-v2.0_alpha/developers-references/typescript-code/cli.md
index f3179d80a5..b710d363c6 100644
--- a/website/versioned_docs/version-v2.0_alpha/developers-references/typescript-code/cli.md
+++ b/website/versioned_docs/version-v2.0_alpha/developers-references/typescript-code/cli.md
@@ -7,14 +7,9 @@ sidebar_position: 3
 
 # Command-line interface
 
-MACI provides a command-line interface that allows for effective deployment and
-testing. Applications that build on top of MACI, such as
-[clr.fund](https://clr.fund/), implement their own web UIs.
+MACI provides a command-line interface that allows for effective deployment and testing. Applications that build on top of MACI, such as [clr.fund](https://clr.fund/), implement their own web UIs.
 
-Note that all the example commands default to a local Ethereum testnet at
-`http://localhost:8545`, and use the Ethereum private key
-`0xc87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3`. Do not
-send any real funds to the address generated by this key.
+Note that all the example commands default to a local Ethereum testnet at `http://localhost:8545`, and use the Ethereum private key `0xc87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3`. Do not send any real funds to the address generated by this key.
 
 For testing purposes, you can run:
 
@@ -25,31 +20,45 @@ pnpm run hardhat
 
 > Note that you will need a hardhat.config file in your current directory to be able to run the cli.
 
+:::info
+If you are looking to use MACI's cli to deploy the smart contracts, we recommend you instead use the smart contract tasks for a better experience. Please refer to the [deployment section](/docs/quick-start/deployment) for more information.
+:::
+
 ## Subcommands
 
-| Command              | Description                                                        | Options                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| -------------------- | ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `create`             | Deploy the contracts                                               | `-i, --initialVoiceCredits <initialVoiceCredits>`: The initial voice credits <br/> `-p, --initialVoiceCreditsProxyAddress <initialVoiceCreditsProxyAddress>`: The initial voice credits proxy contract address <br/> `-g, --signupGatekeeperAddress <signupGatekeeperAddress>`: The signup gatekeeper contract address <br/> `-ph3, --poseidonT3Address <poseidonT3Address>`: The PoseidonT3 contract address <br/> `-ph4, --poseidonT4Address <poseidonT4Address>`: The PoseidonT4 contract address <br/> `-ph5, --poseidonT5Address <poseidonT5Address>`: The PoseidonT5 contract address <br/> `-ph6, --poseidonT6Address <poseidonT6Address>`: The PoseidonT6 contract address <br/> `-g, --signupGatekeeperAddress <signupGatekeeperAddress>`: The signup gatekeeper contract address <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL <br/> `-s, --stateTreeDepth <stateTreeDepth>`: The state tree depth <br/> `-uq, --use-quadratic-voting`: Whether to use quadratic voting                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `checkVerifyingKeys` | Check that the verifying keys in the contract match the local ones | `-uq, --use-quadratic-voting"`: Whether to use quadratic voting <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL <br/> `-vk, --vk-contract <vkContract>`: The VkRegistry contract address <br/> `-s, --state-tree-depth <stateTreeDepth>`: The state tree depth <br/> `-i, --int-state-tree-depth <intStateTreeDepth>`: The intermediate state tree depth <br/> `-m, --msg-tree-depth <messageTreeDepth>`: The message tree depth <br/> `-v, --vote-option-tree-depth <voteOptionTreeDepth>`: The vote option tree depth <br/> `-b, --msg-batch-depth <messageBatchDepth>`: The message batch depth <br/> `-p, --process-messages-zkey <processMessagesZkeyPath>`: The process messages zkey path (see different options to use specific circuits [Trusted setup](https://maci.pse.dev/docs/trusted-setup) or [Testing](https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)) <br/> `-t, --tally-votes-zkey <tallyVotesZkeyPath>`: The tally votes zkey path (see different options to use specific circuits [Trusted setup](https://maci.pse.dev/docs/trusted-setup) or [Testing](https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing))                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `genMaciPubKey`      | Generate a new MACI public key                                     | `-sk, --privkey <privkey>`: The private key <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `genMaciKeyPair`     | Generate a new MACI key pair                                       | `-sp, --seed <seed>`: seed value for keypair <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| `airdrop`            | Airdrop topup credits to the coordinator                           | `-a, --amount <amount>`: The amount of topup <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-o, --poll-id <pollId>`: Poll id <br/> `-t, --token-address <tokenAddress>`: The token address <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| `deployVkRegistry`   | Deploy a new verification key registry contract                    | `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `show`               | Show the deployed contract addresses                               | `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `deployPoll`         | Deploy a new poll                                                  | `-vk, --vkRegistryAddress <vkRegistryAddress>`: The vk registry contract address <br/> `-t, --duration <pollDuration>`: The poll duration in seconds <br/> `-i, --int-state-tree-depth <intStateTreeDepth>`: The int state tree depth <br/> `-b, --msg-batch-depth <messageTreeSubDepth>`: The message tree sub depth <br/> `-m, --msg-tree-depth <messageTreeDepth>`: The message tree depth <br/> `-v, --vote-option-tree-depth <voteOptionTreeDepth>`: The vote option tree depth <br/> `-pk, --pubkey <coordinatorPubkey>`: The coordinator public key <br/> `-uq, --use-quadratic-voting"`: Whether to use quadratic voting <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `setVerifyingKeys`   | Set the verifying keys                                             | `-s, --state-tree-depth <stateTreeDepth>`: The state tree depth <br/> `-i, --int-state-tree-depth <intStateTreeDepth>`: The intermediate state tree depth <br/> `-m, --msg-tree-depth <messageTreeDepth>`: The message tree depth <br/> `-v, --vote-option-tree-depth <voteOptionTreeDepth>`: The vote option tree depth <br/> `-b, --msg-batch-depth <messageBatchDepth>`: The message batch depth <br/> `-pqv, --process-messages-zkey-qv <processMessagesZkeyPathQv>`: The process messages qv zkey path (see different options to use specific circuits [Trusted setup](https://maci.pse.dev/docs/trusted-setup) or [Testing](https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)) <br/> `-tqv, --tally-votes-zkey-qv <tallyVotesZkeyPathQv>`: The tally votes qv zkey path (see different options to use specific circuits [Trusted setup](https://maci.pse.dev/docs/trusted-setup) or [Testing](https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)) <br/> `-pnqv, --process-messages-zkey-non-qv <processMessagesZkeyPathNonQv>`: The process messages non-qv zkey path (see different options to use specific circuits [Trusted setup](https://maci.pse.dev/docs/trusted-setup) or [Testing](https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)) <br/> `-tnqv, --tally-votes-zkey-non-qv <tallyVotesZkeyPathNonQv>`: The tally votes qv zkey path (see different options to use specific circuits [Trusted setup](https://maci.pse.dev/docs/trusted-setup) or [Testing](https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)) <br/> `-uq, --use-quadratic-voting"`: Whether to use quadratic voting <br/> `-k, --vk-registry <vkRegistry>`: The vk registry contract address <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL              |
-| `publish`            | Publish a new message to a MACI Poll contract                      | `-p, --pubkey <pubkey>`: The MACI public key which should replace the user's public key in the state tree <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-sk, --privkey <privkey>`: Your serialized MACI private key <br/> `-i, --state-index <stateIndex>`: The user's state index <br/> `-v, --vote-option-index <voteOptionIndex>`: The vote option index <br/> `-n, --nonce <nonce>`: The message nonce <br/> `-s, --salt <salt>`: The message salt <br/> `-o, --poll-id <pollId>`: The poll id <br/> `-w, --new-vote-weight <newVoteWeight>`: The new vote weight <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `mergeMessages`      | Merge the message accumulator queue                                | `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-o, --poll-id <pollId>`: The poll id <br/> `-n, --num-queue-ops <numQueueOps>`: The number of queue operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `mergeSignups`       | Merge the signups accumulator queue                                | `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-o, --poll-id <pollId>`: The poll id <br/> `-n, --num-queue-ops <numQueueOps>`: The number of queue operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `timeTravel`         | Fast-forward the time (only works for local hardhat testing)       | `-s, --seconds <seconds>`: The number of seconds to fast-forward <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| `extractVkToFile`    | Extract verification keys (vKey) from zKey files                   | `-pqv, --process-messages-zkey-qv <processMessagesZkeyPathQv>`: The path of processMessagesQv zkey files <br/> `-tqv, --tally-votes-zkey-qv <tallyVotesZkeyPathQv>`: The path of tallyVotesQv zkey files <br/> `-pnqv, --process-messages-zkey-non-qv <processMessagesZkeyPathNonQv>`: The path of processMessagesNonQv zkey files <br/> `-tnqv, --tally-votes-zkey-non-qv <tallyVotesZkeyPathNonQv>`: The path of tallyVotesNonQv zkey files <br/>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `signup`             | Sign up to a MACI contract                                         | `-p, --pubkey <maciPubKey>`: The MACI public key <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-s, --sg-data <sgData>`: The signup gateway data <br/> `-i, --ivcp-data <ivcpData>`: The initial voice credit proxy data <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `isRegisteredUser`   | Checks if user is registered with public key                       | `-p, --pubkey <maciPubKey>`: The MACI public key <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-q, --quiet`: Whether to print values to the console                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `topup`              | Top up an account with voice credits                               | `-a, --amount <amount>`: The amount of topup <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-i, --state-index <stateIndex>`: State leaf index <br/> `-o, --poll-id <pollId>`: Poll id <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `fundWallet`         | Fund a wallet with Ether                                           | `-a, --amount <amount>`: The amount of Ether <br/> `-w, --address <address>`: The address to fund <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `verify`             | Verify the results of a poll on-chain                              | `-o, --poll-id <pollId>`: The poll id <br/> `-t, --tally-file <tallyFile>`: The tally file with results, per vote option spent credits, spent voice credits total <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-tc, --tally-contract <tallyContract>`: The tally contract address <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| `genProofs`          | Generate the proofs for a poll                                     | `-sk, --privkey <privkey>`: Your serialized MACI private key <br/> `-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-o, --poll-id <pollId>`: The poll id <br/> `-t, --tally-file <tallyFile>`: The tally file <br/> `-r, --rapidsnark <rapidsnark>`: The path to the rapidsnark binary <br/> `-wp, --process-witnessgen <processWitnessgen>`: The path to the process witness generation binary <br/> `-pd, --process-witnessdat <processWitnessdat>`: The path to the process witness dat file <br/> `-wt, --tally-witnessgen <tallyWitnessgen>`: The path to the tally witness generation binary <br/> `-td, --tally-witnessdat <tallyWitnessdat>`: The path to the tally witness dat file <br/> `-zp, --process-zkey <processZkey`: The path to the process zkey <br/> `-zt, --tally-zkey <tallyZkey>`: The path to the tally zkey <br/> `-q, --quiet`: Whether to print values to the console <br/> `-p, --rpc-provider <provider>`: The rpc provider URL <br/> `-f, --output <outputDir>`: The output directory for proofs <br/> `-tx, --transaction-hash <transactionHash>:` Transaction hash of MACI contract creation <br/> `-w, --wasm`: Whether to use the wasm binaries <br/> `-pw, --process-wasm <processWasm>`: The path to the process witness generation wasm binary <br/> `-tw, --tally-wasm <tallyWasm>`: The path to the tally witness generation wasm binary <br/> `-st, --state-file <stateFile>`: The path to the state file containing the serialized maci state <br/> `-sb, --start-block <startBlock>`: The block number to start looking for events from <br/> `-eb, --end-block <endBlock>`: The block number to end looking for events from <br/> `-bb, --blocks-per-batch <blockPerBatch>`: The number of blocks to process per batch <br/> `-uq, --use-quadratic-voting`: Whether to process messages and tally votes using quadratic voting or not |
-| `proveOnChain`       | Prove the results of a poll on chain                               | `-o, --poll-id <pollId>`: The poll id <br/> `-q, --quiet`: Whether to print values to the console <br/> `-r, --rpc-provider <provider>`: The rpc provider URL <br/>`-x, --maci-address <maciAddress>`: The MACI contract address <br/> `-p, --message-processor-address <messageProcessorAddress>`: The message processor contract address <br/> `-t, --tally-contract <tallyContract>`: The tally contract address <br/> `-f, --proof-dir <proofDir>`: The proof output directory from the genProofs subcommand                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+For a full list of MACI CLI's commands, please run the following:
+
+```bash
+maci-cli --help
+```
+
+For detailed information about each command please run:
+
+```bash
+maci-cli <command> --help
+```
+
+| Command              | Description                                                        |
+| -------------------- | ------------------------------------------------------------------ |
+| `create`             | Deploy the contracts                                               |
+| `deployVkRegistry`   | Deploy a new VkRegistry contract                                   |
+| `setVerifyingKeys`   | Set the verifying keys                                             |
+| `deployPoll`         | Deploy a new poll                                                  |
+| `checkVerifyingKeys` | Check that the verifying keys in the contract match the local ones |
+| `genMaciPubKey`      | Generate a new MACI public key                                     |
+| `genMaciKeyPair`     | Generate a new MACI key pair                                       |
+| `show`               | Show the deployed contract addresses                               |
+| `publish`            | Publish a new message to a MACI Poll contract                      |
+| `mergeMessages`      | Merge the message accumulator queue                                |
+| `mergeSignups`       | Merge the signups accumulator queue                                |
+| `timeTravel`         | Fast-forward the time (only works for local hardhat testing)       |
+| `extractVkToFile`    | Extract verification keys (vKey) from zKey files                   |
+| `signup`             | Sign up to a MACI contract                                         |
+| `isRegisteredUser`   | Checks if user is registered with public key                       |
+| `fundWallet`         | Fund a wallet with Ether                                           |
+| `verify`             | Verify the results of a poll on-chain                              |
+| `genProofs`          | Generate the proofs for a poll                                     |
+| `proveOnChain`       | Prove the results of a poll on chain                               |
 
 ## Public and private key format