Back to template, only without the secrets

Change-Id: I73e315beeb61bd696f6b4702a1e155165414991b