diff --git a/ops/deployments-from-scratch.md b/ops/deployments-from-scratch.md
index 9483c82..4a99ee4 100644
--- a/ops/deployments-from-scratch.md
+++ b/ops/deployments-from-scratch.md
@@ -279,123 +279,6 @@
 
 </details>
 
-<details open>
-  <summary>Shopify</summary>
-
-## Shopify
-
-* Stack: <https://git.vdb.to/cerc-io/testnet-laconicd-stack/src/branch/main/stack-orchestrator/stacks/laconic-shopify>
-
-* Source repo: <https://git.vdb.to/cerc-io/shopify>
-
-* Target dir: `/srv/shopify/laconic-shopify-deployment`
-
-* Cleanup an existing deployment if required:
-
-  ```bash
-  cd /srv/shopify
-
-  # Stop the deployment
-  laconic-so deployment --dir laconic-shopify-deployment stop
-
-  # Remove the deployment dir
-  sudo rm -rf laconic-shopify-deployment
-
-  # Remove the existing spec file
-  rm laconic-shopify-spec.yml
-  ```
-
-### Setup
-
-* Clone the stack repo:
-
-  ```bash
-  laconic-so fetch-stack git.vdb.to/cerc-io/testnet-laconicd-stack --pull
-
-  # This should clone the testnet-laconicd-stack repo at `/home/dev/cerc/testnet-laconicd-stack`
-  ```
-
-* Clone required repositories:
-
-  ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify setup-repositories --pull
-
-  # This should clone the laconicd repos at `/home/dev/cerc/shopify` and `/home/dev/cerc/laconic-faucet`
-  ```
-
-* Build the container images:
-
-  ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify build-containers --force-rebuild
-
-  # This should create the "cerc/laconic-shopify" and "cerc/laconic-shopify-faucet"  Docker images
-  ```
-
-### Deployment
-
-* Create a spec file for the deployment:
-
-  ```bash
-  cd /srv/shopify
-
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify deploy init --output laconic-shopify-spec.yml
-  ```
-
-* Create a deployment from the spec file:
-
-  ```bash
-  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify deploy create --spec-file laconic-shopify-spec.yml --deployment-dir laconic-shopify-deployment
-  ```
-
-* Inside the `laconic-shopify-deployment` deployment directory, open `config.env` file and set following env variables:
-
-  ```bash
-  # Shopify GraphQL URL
-  CERC_SHOPIFY_GRAPHQL_URL='https://6h071x-zw.myshopify.com/admin/api/2024-10/graphql.json'
-
-  # Access token for Shopify API
-  CERC_SHOPIFY_ACCESS_TOKEN=
-
-  # Delay for fetching orders in milliseconds
-  CERC_FETCH_ORDER_DELAY=10000
-
-  # Number of line items per order in Get Orders GraphQL query
-  CERC_ITEMS_PER_ORDER=10
-
-  # Private key of a funded faucet account
-  CERC_FAUCET_KEY=
-
-  # laconicd RPC endpoint
-  CERC_LACONICD_RPC_ENDPOINT='https://laconicd-sapo.laconic.com'
-
-  # laconicd chain id
-  CERC_LACONICD_CHAIN_ID=laconic-testnet-2
-
-  # laconicd address prefix
-  CERC_LACONICD_PREFIX=laconic
-
-  # laconicd gas price
-  CERC_LACONICD_GAS_PRICE=0.001
-  ```
-
-### Start
-
-* Start the deployment:
-
-  ```bash
-  laconic-so deployment --dir laconic-shopify-deployment start
-  ```
-
-* Check status:
-
-  ```bash
-  # Check logs for faucet and shopify containers
-  laconic-so deployment --dir laconic-shopify-deployment logs shopify -f
-  laconic-so deployment --dir laconic-shopify-deployment logs faucet -f
-  ```
-
-</details>
-
 <details open>
   <summary>testnet-onboarding-app</summary>
 
@@ -1150,9 +1033,9 @@
     ports:
       laconicd:
         - '6060'
-        - '127.0.0.1:36657:26657'
+        - '36657:26657'
         - '36656:26656'
-        - '127.0.0.1:3473:9473'
+        - '3473:9473'
         - '127.0.0.1:3090:9090'
         - '127.0.0.1:3317:1317'
   ```
@@ -1271,6 +1154,123 @@
 
 </details>
 
+<details open>
+  <summary>Shopify</summary>
+
+## Shopify
+
+* Stack: <https://git.vdb.to/cerc-io/testnet-laconicd-stack/src/branch/main/stack-orchestrator/stacks/laconic-shopify>
+
+* Source repo: <https://git.vdb.to/cerc-io/shopify>
+
+* Target dir: `/srv/shopify/laconic-shopify-deployment`
+
+* Cleanup an existing deployment if required:
+
+  ```bash
+  cd /srv/shopify
+
+  # Stop the deployment
+  laconic-so deployment --dir laconic-shopify-deployment stop
+
+  # Remove the deployment dir
+  sudo rm -rf laconic-shopify-deployment
+
+  # Remove the existing spec file
+  rm laconic-shopify-spec.yml
+  ```
+
+### Setup
+
+* Clone the stack repo:
+
+  ```bash
+  laconic-so fetch-stack git.vdb.to/cerc-io/testnet-laconicd-stack --pull
+
+  # This should clone the testnet-laconicd-stack repo at `/home/dev/cerc/testnet-laconicd-stack`
+  ```
+
+* Clone required repositories:
+
+  ```bash
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify setup-repositories --pull
+
+  # This should clone the laconicd repos at `/home/dev/cerc/shopify` and `/home/dev/cerc/laconic-faucet`
+  ```
+
+* Build the container images:
+
+  ```bash
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify build-containers --force-rebuild
+
+  # This should create the "cerc/laconic-shopify" and "cerc/laconic-shopify-faucet"  Docker images
+  ```
+
+### Deployment
+
+* Create a spec file for the deployment:
+
+  ```bash
+  cd /srv/shopify
+
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify deploy init --output laconic-shopify-spec.yml
+  ```
+
+* Create a deployment from the spec file:
+
+  ```bash
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconic-shopify deploy create --spec-file laconic-shopify-spec.yml --deployment-dir laconic-shopify-deployment
+  ```
+
+* Inside the `laconic-shopify-deployment` deployment directory, open `config.env` file and set following env variables:
+
+  ```bash
+  # Shopify GraphQL URL
+  CERC_SHOPIFY_GRAPHQL_URL='https://6h071x-zw.myshopify.com/admin/api/2024-10/graphql.json'
+
+  # Access token for Shopify API
+  CERC_SHOPIFY_ACCESS_TOKEN=
+
+  # Delay for fetching orders in milliseconds
+  CERC_FETCH_ORDER_DELAY=10000
+
+  # Number of line items per order in Get Orders GraphQL query
+  CERC_ITEMS_PER_ORDER=10
+
+  # Private key of a funded faucet account
+  CERC_FAUCET_KEY=
+
+  # laconicd RPC endpoint
+  CERC_LACONICD_RPC_ENDPOINT='https://laconicd-sapo.laconic.com'
+
+  # laconicd chain id
+  CERC_LACONICD_CHAIN_ID=laconic-testnet-2
+
+  # laconicd address prefix
+  CERC_LACONICD_PREFIX=laconic
+
+  # laconicd gas price
+  CERC_LACONICD_GAS_PRICE=0.001
+  ```
+
+### Start
+
+* Start the deployment:
+
+  ```bash
+  laconic-so deployment --dir laconic-shopify-deployment start
+  ```
+
+* Check status:
+
+  ```bash
+  # Check logs for faucet and shopify containers
+  laconic-so deployment --dir laconic-shopify-deployment logs shopify -f
+  laconic-so deployment --dir laconic-shopify-deployment logs faucet -f
+  ```
+
+</details>
+
 <details open>
   <summary>Fixturenet Eth</summary>
 
diff --git a/ops/stage1-to-stage2.md b/ops/stage1-to-stage2.md
index 3c62451..d3453a7 100644
--- a/ops/stage1-to-stage2.md
+++ b/ops/stage1-to-stage2.md
@@ -128,7 +128,7 @@
     scp dev@<deployments-server-hostname>:/srv/laconicd/stage2-deployment/genesis.json </path/to/local/directory>
     ```
 
-* Now users can follow the steps to [Upgrade to testnet2](../testnet-onboarding-validator.md#upgrade-to-testnet2)
+* Now users can follow the steps to [Upgrade to SAPO testnet](../testnet-onboarding-validator.md#upgrade-to-sapo-testnet)
 
 ## Bank Transfer
 
diff --git a/testnet-onboarding-validator.md b/testnet-onboarding-validator.md
index 4f4ebf7..9e2c9e9 100644
--- a/testnet-onboarding-validator.md
+++ b/testnet-onboarding-validator.md
@@ -295,7 +295,7 @@ laconic-so deployment --dir testnet-laconicd-deployment start
 
 * A testnet stage1 node
 
-  * For setting up a fresh testnet2 node, follow [Join as a validator](#join-as-a-validator-on-stage1), but use testnet2 chain id (`laconic-testnet-2`)
+  * For setting up a fresh testnet2 node, follow [Join as a validator](#join-as-a-validator-on-stage1) instead, but use testnet2 chain id (`laconic-testnet-2`)
 
 ### Setup