Build control image with new keystone fix