FORGE-1902: Fixed current resource setup