Moved some things around, updated pod spec for v1.2