Use artifactDir variable everywhere