Update for selinux builds and images