diff --git a/.gitignore b/.gitignore
index e2086ed..3be07f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *-deployment
 *-spec.yml
-mainnet-genesis
 output
 
 # Playbook vars
diff --git a/docs/demo.md b/docs/demo.md
index c15809d..bbf9a05 100644
--- a/docs/demo.md
+++ b/docs/demo.md
@@ -11,14 +11,6 @@
 
 - Following steps can be used to run subsequent validator nodes
 
-- Fetch the stack:
-
-  ```bash
-  laconic-so fetch-stack git.vdb.to/cerc-io/laconicd-stack --git-ssh --pull
-  ```
-
-  This command clones the entire repository into the `~/cerc` folder, which includes the genesis file published by the first validator.
-
 - Copy the example variables file:
 
   ```bash
@@ -36,6 +28,8 @@
 - Update `cerc_peers` in `~/cerc/laconicd-stack/playbooks/validator/validator-vars.yml`:
 
   ```bash
+  cerc_moniker: "LaconicMainnetNode-2"
+
   cerc_peers: "<node-id>@host.docker.internal:26656"
   ```
 
@@ -50,7 +44,7 @@
   export MAINNET_DEPLOYMENT_DIR=
   ```
 
-- Update port mappings in `~/cerc/laconicd-stack/playbooks/validator/templates/specs/spec-template.yml.j2` with:
+- Update port mappings in `~/cerc/laconicd-stack/playbooks/validator/templates/specs/spec-template.yml.j2` to avoid port conflicts with first validator node:
 
   ```bash
   network:
diff --git a/docs/run-first-validator.md b/docs/run-first-validator.md
index 012fa44..b9af21d 100644
--- a/docs/run-first-validator.md
+++ b/docs/run-first-validator.md
@@ -5,16 +5,14 @@
 - [ansible](playbooks/README.md#ansible-installation)
 - [laconic-so](https://github.com/cerc-io/stack-orchestrator/?tab=readme-ov-file#install)
 
-## Stop testnet node
+## Generate mainnet genesis file
 
-- Stop the testnet node:
+- Stop the node for SAPO testnet:
 
   ```bash
   laconic-so deployment --dir <testnet-deployment-dir> stop
   ```
 
-## Generate mainnet genesis file
-
 - Fetch the stack in machine where the testnet chain node is running:
 
   ```bash
@@ -84,7 +82,7 @@
 
   ```bash
   # Private key of the existing account in hex format (required for gentx)
-  pvt_key: ""
+  pvt_key: "<private-key>"
 
   # Path to the generated mainnet genesis file
   # Use the absolute path of generated output directory in the previous steps
diff --git a/docs/run-validator.md b/docs/run-validator.md
index 3e36182..f359113 100644
--- a/docs/run-validator.md
+++ b/docs/run-validator.md
@@ -5,16 +5,14 @@
 - [ansible](playbooks/README.md#ansible-installation)
 - [laconic-so](https://github.com/cerc-io/stack-orchestrator/?tab=readme-ov-file#install)
 
-## Stop testnet node
+## Run node
 
-- Stop the testnet node:
+- Stop the node for SAPO testnet:
 
   ```bash
   laconic-so deployment --dir <testnet-deployment-dir> stop
   ```
 
-## Run node
-
 - Fetch the stack:
 
   ```bash
@@ -32,26 +30,11 @@
 - Update `~/cerc/laconicd-stack/playbooks/validator/validator-vars.yml` with required values:
 
   ```bash
-  # Path to the genesis file published by the first validator
-  genesis_file: "~/cerc/laconicd-stack/config/mainnet-genesis.json"
-
-  # Path to the staking amount file published by the first validator
-  staking_amount_file: "~/cerc/laconicd-stack/config/staking-amount.json"
-
   # Set custom moniker for the node
-  cerc_moniker: "LaconicMainnetNode"
-
-  # Set chain ID (should match the one in the genesis file)
-  cerc_chain_id: "laconic-mainnet"
-
-  # Set minimum gas price
-  min_gas_price: 0.001
-
-  # Set log level
-  cerc_loglevel: "info"
+  cerc_moniker: "<your-moniker>"
 
   # Set persistent peers (comma-separated list of node IDs and addresses)
-  # You can find the list of available peers in node-addresses.yml
+  # You can find the list of available peers in https://git.vdb.to/cerc-io/laconicd-stack/src/branch/main/node-addresses.yml
   cerc_peers: "<node-id>@<node-host>:26656,<node-id>@<node-host>:26656"
   ```
 
diff --git a/playbooks/first-validator/first-validator-vars.example.yml b/playbooks/first-validator/first-validator-vars.example.yml
index 719ff11..c66ff5f 100644
--- a/playbooks/first-validator/first-validator-vars.example.yml
+++ b/playbooks/first-validator/first-validator-vars.example.yml
@@ -2,7 +2,7 @@ cerc_moniker: "LaconicMainnetNode"
 cerc_chain_id: "laconic-mainnet"
 min_gas_price: 0.001
 cerc_loglevel: "info"
-key_name: "validator"
+key_name: "laconic-validator"
 pvt_key: ""
-genesis_file:
-staking_amount_file:
+genesis_file: ""
+staking_amount_file: ""
diff --git a/playbooks/validator/validator-vars.example.yml b/playbooks/validator/validator-vars.example.yml
index 1590078..df003fe 100644
--- a/playbooks/validator/validator-vars.example.yml
+++ b/playbooks/validator/validator-vars.example.yml
@@ -1,7 +1,7 @@
-cerc_moniker: "LaconicMainnetNode"
 cerc_chain_id: "laconic-mainnet"
 min_gas_price: 0.001
 cerc_loglevel: "info"
 genesis_file: "~/cerc/laconicd-stack/config/mainnet-genesis.json"
 staking_amount_file: "~/cerc/laconicd-stack/config/staking-amount.json"
+cerc_moniker: ""
 cerc_peers: ""
diff --git a/stack-orchestrator/config/mainnet-laconicd/run-laconicd.sh b/stack-orchestrator/config/mainnet-laconicd/run-laconicd.sh
index 047b659..7051bea 100755
--- a/stack-orchestrator/config/mainnet-laconicd/run-laconicd.sh
+++ b/stack-orchestrator/config/mainnet-laconicd/run-laconicd.sh
@@ -53,7 +53,6 @@ else
   sed -i 's/prometheus = false/prometheus = true/g' $NODE_HOME/config/config.toml
 fi
 
-
 echo "Starting laconicd node..."
 laconicd start \
   --api.enable \