Consolidate tuna props

Change-Id: I9653f5e7e91e79de5fcd7748b7d7b83d4fb7e91f