GTNPORTAL-3315: Portal setup improvements