diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 2b24464e2b..2e658855e4 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -66,10 +66,16 @@
     name: puppet-lint
     builders:
       - shell: |
-          test -d modules || {{
-            ln -s . {project}
-            cd {project}
-          }}
+          if [ -f Modulefile ]; then
+            MODULE=$(awk '/^name/ {print $NF}' Modulefile |tr -d \"\')
+            if [ -z "$MODULE" ]; then
+              echo "Module name not defined in Modulefile"
+            else
+              mkdir -p "$MODULE"
+              rsync -a --exclude="$MODULE" --exclude ".*" . "$MODULE"
+              cd "$MODULE"
+            fi
+          fi
           rake lint
 
 - builder:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
index b14d177b3a..e91c993356 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
@@ -20,8 +20,7 @@
 
     builders:
       - gerrit-git-prep
-      - puppet-lint:
-          project: '{name}'
+      - puppet-lint
 
     publishers:
       - console-log