diff --git a/bin/prepare_test_show_highstate_env.sh b/bin/prepare_test_show_highstate_env.sh
index 29fdb73..1f08bd7 100755
--- a/bin/prepare_test_show_highstate_env.sh
+++ b/bin/prepare_test_show_highstate_env.sh
@@ -17,7 +17,9 @@ $SUDO zypper -qn in --no-recommends salt git python3 python3-PyYAML
 $SUDO rm -rf /srv/{salt,pillar}
 $SUDO ln -s $PWD/salt /srv/salt
 $SUDO ln -s $PWD/pillar /srv/pillar
-printf "domain: infra.opensuse.org\nosfullname:\nosmajorrelease:\nosrelease_info:" | $SUDO tee /etc/salt/grains > /dev/null
-sed -i -e 's/^production:$/base:/' /srv/{salt,pillar}/top.sls
+ID=$(hostname -f)
 ROLES=$(bin/get_roles.py --yaml)
-printf "city:\ncountry:\nsalt_cluster: opensuse\nvirt_cluster:\n$ROLES" > pillar/id/${HOSTNAME}.sls
+printf "city:\ncountry:\ndomain: infra.opensuse.org\nosfullname:\nosmajorrelease:\nosrelease_info:\n$ROLES\nsalt_cluster: opensuse\nvirt_cluster:" | $SUDO tee /etc/salt/grains > /dev/null
+sed -i -e 's/^production:$/base:/' /srv/{salt,pillar}/top.sls
+touch pillar/id/${ID//./_}.sls
+sed -i -e "s#\- secrets\..*#- id.${ID//./_}#g" $(grep -lr "\- secrets\.")