I add paint slots for base color (albedo), bump (heightmap) and roughness. The bump and roughness maps just contain black and white values (greyscale), the nodes for the principled shader are set to non-color data for them.

In one of the next tutorials I show how to convert the heightmap into a normal map so that you can use the textures in a game engine like Unity, Godot or Unreal Engine.

See my social profiles here
G+: https://plus.google.com/+JayAnAm
Twitter: https://twitter.com/jayanamgames
Facebook: https://www.facebook.com/jayanamgames
Patreon: https://www.patreon.com/jayanam

Production Music courtesy of Epidemic Sound: http://www.epidemicsound.com