Add more Tags to builds to better control Environment

This can be helpful to enable debugging/dev options on UNOFFICIAL Builds

Change-Id: I00d416ee3a3589426709b3988c12def1ac57513e