Update infrastructure changes related to outstanding tags and metadata

[jacek-dudek]

There are a couple of tag related changes left for dev infrastructure resources that I missed and I still need to apply all the tag related changes for prod infrastructure resources, like this one for example: