Creating missing Render Passes (AOVs) in MovieRenderQueue

Trying to create missing render passes for the MovieRenderQueue. Attached is the MovieRenderQueue_AmbientOcclusion post process material.

For the others would it simply be a matter of changing the SceneTexture node? ie to Roughness, Specular, BaseColor etc?

Or would there be additional changes needed?