diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 539cc55c..d73b81ea 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,6 +6,7 @@ on:
       - "main"
     tags:
       - "v*.*.*"
+  workflow_dispatch:
 
 jobs:
   docker:
diff --git a/docker/startCodex.sh b/docker/startCodex.sh
index 95366b90..4f0a08a3 100644
--- a/docker/startCodex.sh
+++ b/docker/startCodex.sh
@@ -106,12 +106,16 @@ if [ -n "$CACHE_SIZE" ]; then
 fi
 
 # Ethereum persistence
-if [ -n "$ETH_PROVIDER" ] && [ -n "$ETH_ACCOUNT" ] && [ -n "$ETH_DEPLOYMENT" ]; then
+if [ -n "$ETH_PROVIDER" ] && [ -n "$ETH_ACCOUNT" ] && [ -n "$ETH_MARKETPLACE_ADDRESS" ]; then
     echo "Persistence enabled"
     args="$args --persistence=true"
     args="$args --eth-provider=$ETH_PROVIDER"
     args="$args --eth-account=$ETH_ACCOUNT"
-    args="$args --eth-deployment=$ETH_DEPLOYMENT"
+    # args="$args --validator"
+
+    # Remove this as soon as CLI option is available:
+    echo "{\"contracts\": { \"Marketplace\": { \"address\": \""$ACCOUNTSTR"\" } } }" > /root/marketplace_address.json
+    args="$args --eth-deployment=/root/marketplace_address.json"
 fi
 
 echo "./root/codex $args"