Consolidate tuna props

Change-Id: I6a3a8ceb45ef314787cc835240bd0b850aef402d