Fixed issues in adding custom containers with the new tag os and arch names. Minor other fixes and improvements.