Consolidate tuna props

Change-Id: Id97545c2f73710269577db0c0d3214883690b6c8