diff --git a/playbooks/first-validator/run-first-validator.yml b/playbooks/first-validator/run-first-validator.yml
index 8c61be7..a81b998 100644
--- a/playbooks/first-validator/run-first-validator.yml
+++ b/playbooks/first-validator/run-first-validator.yml
@@ -22,18 +22,17 @@
           Required key files are not defined.
           Please set genesis_file in run-first-validator-vars.yml.
       when: not genesis_file
+    - name: Fetch laconicd stack
+      shell: laconic-so fetch-stack git.vdb.to/cerc-io/laconicd-stack --git-ssh --pull
 
-    # - name: Fetch laconicd stack
-    #   shell: laconic-so fetch-stack git.vdb.to/cerc-io/laconicd-stack --git-ssh --pull
+    - name: Setup required repositories
+      shell: >
+        laconic-so --stack ~/cerc/laconicd-stack/stack-orchestrator/stacks/mainnet-laconicd
+        setup-repositories --git-ssh --pull
 
-    # - name: Setup required repositories
-    #   shell: >
-    #     laconic-so --stack ~/cerc/laconicd-stack/stack-orchestrator/stacks/mainnet-laconicd
-    #     setup-repositories --git-ssh --pull
-
-    # - name: Build container images
-    #   shell: |
-    #     laconic-so --stack ~/cerc/laconicd-stack/stack-orchestrator/stacks/mainnet-laconicd build-containers
+    - name: Build container images
+      shell: |
+        laconic-so --stack ~/cerc/laconicd-stack/stack-orchestrator/stacks/mainnet-laconicd build-containers
 
     - name: Create deployment spec file
       shell: |
diff --git a/stack-orchestrator/config/mainnet-laconicd/create-and-collect-gentx.sh b/stack-orchestrator/config/mainnet-laconicd/create-and-collect-gentx.sh
index 18d8d80..9f8902f 100755
--- a/stack-orchestrator/config/mainnet-laconicd/create-and-collect-gentx.sh
+++ b/stack-orchestrator/config/mainnet-laconicd/create-and-collect-gentx.sh
@@ -39,6 +39,7 @@ export DENOM=$(echo "$DENOM" | sed -e 's/^["'\'']//g' -e 's/["'\'']$//g')
 
 # Init
 laconicd config set client chain-id $CHAIN_ID --home $NODE_HOME
+laconicd config set client keyring-backend $KEYRING
 laconicd init $MONIKER --chain-id=$CHAIN_ID --home $NODE_HOME
 
 # Copy over provided genesis config