diff --git a/jenkins/client/job.sls b/jenkins/client/job.sls
index dbf7cc2..8139299 100644
--- a/jenkins/client/job.sls
+++ b/jenkins/client/job.sls
@@ -15,7 +15,6 @@
   - template: jinja
   - defaults:
       job_name: {{ job_name }}
-      job: {{ job }}
   - require:
     - file: jenkins_client_dirs
 
diff --git a/jenkins/files/jobs/workflow-scm.xml b/jenkins/files/jobs/workflow-scm.xml
index 82c1d71..dce464a 100644
--- a/jenkins/files/jobs/workflow-scm.xml
+++ b/jenkins/files/jobs/workflow-scm.xml
@@ -1,4 +1,6 @@
 {%- from "jenkins/map.jinja" import client with context -%}
+{%- set job = salt['pillar.get']('jenkins:client:job:'+job_name) -%}
+
 <?xml version='1.0' encoding='UTF-8'?>
 <flow-definition plugin="workflow-job@2.6">
   {%- include "jenkins/files/jobs/_common.xml" %}
diff --git a/jenkins/files/jobs/workflow.xml b/jenkins/files/jobs/workflow.xml
index 4125ddc..6ce817a 100644
--- a/jenkins/files/jobs/workflow.xml
+++ b/jenkins/files/jobs/workflow.xml
@@ -1,13 +1,15 @@
 {%- from "jenkins/map.jinja" import client with context -%}
-{%- macro load_groovy_file() %}
-{%- set groovy_file=client.dir.jenkins_jobs_root+'/'+job.script.repository+'/'+job.script.file %}
-{%- include groovy_file %}
-{%- endmacro %}
+{%- set job = salt['pillar.get']('jenkins:client:job:'+job_name) -%}
 
-{%- macro load_groovy_lib(lib) %}
-{%- set groovy_file=client.dir.jenkins_jobs_root+'/'+lib.repository+'/'+lib.file %}
-{%- include groovy_file %}
-{%- endmacro %}
+{%- macro load_groovy_file() -%}
+{%- set groovy_file=client.dir.jenkins_jobs_root+'/'+job.script.repository+'/'+job.script.file -%}
+{%- include groovy_file -%}
+{%- endmacro -%}
+
+{%- macro load_groovy_lib(lib) -%}
+{%- set groovy_file=client.dir.jenkins_jobs_root+'/'+lib.repository+'/'+lib.file -%}
+{%- include groovy_file -%}
+{%- endmacro -%}
 
 <?xml version='1.0' encoding='UTF-8'?>
 <flow-definition plugin="workflow-job@2.5">