Shooter: more config changes

Change-Id: I7a9d817775a7ce49aa26dffb33381776f3b66d8a