diff --git a/.github/actions/prepare/action.yaml b/.github/actions/prepare/action.yaml
index 7bbe576..90fc8db 100644
--- a/.github/actions/prepare/action.yaml
+++ b/.github/actions/prepare/action.yaml
@@ -35,7 +35,7 @@ runs:
       uses: docker/metadata-action@v5
       with:
         images: ethpandaops/ethereum-genesis-generator
-        flavor: latest=true
+        flavor: latest=auto
         tags: |
           type=semver,pattern={{version}}
           type=ref,event=branch
diff --git a/README.md b/README.md
index 2a1074b..dfcecbf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Create a ethereum consensus/execution layer testnet genesis and optionally expos
 
 ### Examples
 
-You can provide your own configuration directory. Have a look at the example in [`config-example`](config-example).
+Create a new file with your custom configuration in /config/values.env. You can use the [values.env](config-example/values.env) file as a template.
 
 ```sh
 # Create the output directory
@@ -13,17 +13,17 @@ mkdir output
 # Overwriting the config files and generating the EL and CL genesis
 docker run --rm -it -u $UID -v $PWD/output:/data \
   -v $PWD/config/values.env:/config/values.env \
-  ethpandaops/ethereum-genesis-generator:latest all
+  ethpandaops/ethereum-genesis-generator:master all
 
 # Just creating the EL genesis
 docker run --rm -it -u $UID -v $PWD/output:/data \
   -v $PWD/config/values.env:/config/values.env \
-  ethpandaops/ethereum-genesis-generator:latest el
+  ethpandaops/ethereum-genesis-generator:master el
 
 # Just creating the CL genesis
 docker run --rm -it -u $UID -v $PWD/output:/data \
   -v $PWD/config/values.env:/config/values.env \
-  ethpandaops/ethereum-genesis-generator:latest cl
+  ethpandaops/ethereum-genesis-generator:master cl
 ```
 ### Environment variables
 
diff --git a/defaults/defaults.env b/defaults/defaults.env
index 91feae9..7f8e6ef 100644
--- a/defaults/defaults.env
+++ b/defaults/defaults.env
@@ -34,6 +34,6 @@ export SHARD_COMMITTEE_PERIOD="${SHARD_COMMITTEE_PERIOD:-256}"
 export SAMPLES_PER_SLOT="${SAMPLES_PER_SLOT:-8}"
 export CUSTODY_REQUIREMENT="${CUSTODY_REQUIREMENT:-4}"
 export DATA_COLUMN_SIDECAR_SUBNET_COUNT="${DATA_COLUMN_SIDECAR_SUBNET_COUNT:-128}"
-export MAX_BLOBS_PER_BLOCK:"${MAX_BLOBS_PER_BLOCK:-6}"
+export MAX_BLOBS_PER_BLOCK="${MAX_BLOBS_PER_BLOCK:-6}"
 export EL_PREMINE_ADDRS="${EL_PREMINE_ADDRS:-"{}"}"
 export ADDITIONAL_PRELOADED_CONTRACTS="${ADDITIONAL_PRELOADED_CONTRACTS:-"{}"}" # '{"0x123463a4B065722E99115D6c222f267d9cABb524": {"balance": "1ETH","code": "0x123465","storage": {},"nonce": 0,"secretKey": "0x"}}'
diff --git a/entrypoint.sh b/entrypoint.sh
index 7d14e22..4f51af0 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -64,8 +64,8 @@ gen_cl_config(){
         mkdir -p /data/parsed
         HUMAN_READABLE_TIMESTAMP=$(date -u -d @"$GENESIS_TIMESTAMP" +"%Y-%b-%d %I:%M:%S %p %Z")
         COMMENT="# $HUMAN_READABLE_TIMESTAMP"
-        sed -i "s/#HUMAN_TIME_PLACEHOLDER/$COMMENT/" /config/cl/config.yaml
         envsubst < /config/cl/config.yaml > /data/metadata/config.yaml
+        sed -i "s/#HUMAN_TIME_PLACEHOLDER/$COMMENT/" /data/metadata/config.yaml
         envsubst < /config/cl/mnemonics.yaml > $tmp_dir/mnemonics.yaml
         # Conditionally override values if preset is "minimal"
         if [[ "$PRESET_BASE" == "minimal" ]]; then