Separate nightlies and releases

Change-Id: I2b93daa0ffae199023d00e2dbd4562c11ac60c03