packstack workarounds:

broke out the workarounds, names are more relevant to the tag names for packstack

Change-Id: I5ec5fb2b96413799209ae51b28235a17d3c18f71