diff --git a/gazpar2mqtt/rootfs/scripts/99-run.sh b/gazpar2mqtt/rootfs/scripts/99-run.sh
index d5cf139f2..1275c5562 100644
--- a/gazpar2mqtt/rootfs/scripts/99-run.sh
+++ b/gazpar2mqtt/rootfs/scripts/99-run.sh
@@ -70,8 +70,8 @@ cat listtmp | while read word || [[ -n $word ]]; do
     # word="${word//[\"\']/}"
     # If secret, replace secret by text
     if [[ "${word}" == *'!secret '* ]]; then
-        key="${word#*=}"
-        secret=${word#*\!secret }
+        key="${word%%=*}"
+        secret=${word#*secret }
         # Get secret password
         #secret=$(yq read "/config/secrets.yaml" "${secret}" 2>/dev/null || yq eval .${secret} "/config/secrets.yaml")
         eval parse_yaml "/config/secrets.yaml" "" >secrettmp