Revert "fix invalid tag"

This reverts commit 13abbc5cfc711ab1082be5420efd1ebe9c20ee71.
Revert "tag with stack name"

This reverts commit b926ae37ce9884341dee18b120626e503e5ec6a6.