diff --git a/app/data/compose/docker-compose-watcher-mobymask-v2.yml b/app/data/compose/docker-compose-watcher-mobymask-v2.yml
index ed5c203a..8478a4d9 100644
--- a/app/data/compose/docker-compose-watcher-mobymask-v2.yml
+++ b/app/data/compose/docker-compose-watcher-mobymask-v2.yml
@@ -33,12 +33,12 @@ services:
     # TODO: Configure env file for ETH RPC URL & private key
     environment:
       - ENV=PROD
-    command: ["sh", "./deploy-invite.sh"]
+    command: ["sh", "./deploy-and-generate-invite.sh"]
     volumes:
-      # TODO: add a script to set rpc endpoint from env
+      # TODO: add a script to set RPC endpoint from env
       #       add manually if running seperately
       - ../config/watcher-mobymask-v2/secrets-template.json:/app/packages/server/secrets-template.json
-      - ../config/watcher-mobymask-v2/deploy-invite.sh:/app/packages/server/deploy-invite.sh
+      - ../config/watcher-mobymask-v2/deploy-and-generate-invite.sh:/app/packages/server/deploy-and-generate-invite.sh
       - moby_data_server:/app/packages/server
       - fixturenet_geth_accounts:/geth-accounts:ro
     healthcheck:
@@ -49,7 +49,7 @@ services:
       start_period: 10s
 
   mobymask-watcher-server:
-    # TODO: pass optimism rpc endpoint
+    # TODO: pass optimism RPC endpoint
     restart: unless-stopped
     depends_on:
       mobymask-watcher-db:
@@ -59,7 +59,7 @@ services:
     image: cerc/watcher-mobymask-v2:local
     command: ["sh", "server-start.sh"]
     volumes:
-      # TODO: add a script to set rpc endpoint from env
+      # TODO: add a script to set RPC endpoint from env
       #       add manually if running seperately
       - ../config/watcher-mobymask-v2/watcher-config-template.toml:/app/packages/mobymask-v2-watcher/environments/watcher-config-template.toml
       - ../config/watcher-mobymask-v2/peer.env:/app/packages/peer/.env
diff --git a/app/data/config/fixturenet-optimism/generate-l2-config.sh b/app/data/config/fixturenet-optimism/generate-l2-config.sh
index 5c45d3c8..bb3c7aff 100755
--- a/app/data/config/fixturenet-optimism/generate-l2-config.sh
+++ b/app/data/config/fixturenet-optimism/generate-l2-config.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
-set -e -x
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
 
 export L1_RPC="http://${L1_HOST}:${L1_PORT}"
 
diff --git a/app/data/config/fixturenet-optimism/optimism-contracts/run.sh b/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
index 867a14ad..ac8ee430 100755
--- a/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
+++ b/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
-set -e -x
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
 
 # TODO Support restarts; fixturenet-eth-geth currently starts fresh on a restart
 # Exit if a deployment already exists (on restarts)
diff --git a/app/data/config/fixturenet-optimism/run-op-batcher.sh b/app/data/config/fixturenet-optimism/run-op-batcher.sh
index 58166989..e2a38d25 100755
--- a/app/data/config/fixturenet-optimism/run-op-batcher.sh
+++ b/app/data/config/fixturenet-optimism/run-op-batcher.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
-set -e -x
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
 
 export L1_RPC="http://${L1_HOST}:${L1_PORT}"
 
diff --git a/app/data/config/fixturenet-optimism/run-op-node.sh b/app/data/config/fixturenet-optimism/run-op-node.sh
index b73dc12f..c4428bae 100755
--- a/app/data/config/fixturenet-optimism/run-op-node.sh
+++ b/app/data/config/fixturenet-optimism/run-op-node.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
-set -e -x
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
 
 export L1_RPC="http://${L1_HOST}:${L1_PORT}"
 
diff --git a/app/data/config/watcher-mobymask-v2/deploy-invite.sh b/app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh
similarity index 100%
rename from app/data/config/watcher-mobymask-v2/deploy-invite.sh
rename to app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh