Consolidate tuna props

Change-Id: I83ab3192614aaa847f0a14ee116ec91522bc4c7c