diff --git a/jenkins/files/jobs/_common.xml b/jenkins/files/jobs/_common.xml
index 68fa370..f48e2dc 100644
--- a/jenkins/files/jobs/_common.xml
+++ b/jenkins/files/jobs/_common.xml
@@ -11,7 +11,7 @@
     {%- if not job.concurrent|default(False) %}
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
     {%- endif %}
-    {%- if job.scm.github is defined %}
+    {%- if job.get('scm', {}).github is defined %}
     <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.21.1">
       <projectUrl>{{ job.scm.github.url }}</projectUrl>
       <displayName>{{ job.scm.github.name|default("") }}</displayName>
@@ -19,7 +19,7 @@
     {%- endif %}
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
-        {%- for type, trigger in job.trigger.iteritems() %}
+        {%- for type, trigger in job.get('trigger', {}).iteritems() %}
         {%- if trigger.enabled|default(True) %}
         {%- if type == 'reverse' %}
         <jenkins.triggers.ReverseBuildTrigger>
diff --git a/jenkins/files/jobs/_parameters.xml b/jenkins/files/jobs/_parameters.xml
index ed0fa56..9015e41 100644
--- a/jenkins/files/jobs/_parameters.xml
+++ b/jenkins/files/jobs/_parameters.xml
@@ -1,4 +1,4 @@
-    {%- if job.param is defined %}
+{%- if job.param is defined %}
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         {%- for param_name, param in job.param.iteritems() %}
@@ -21,7 +21,7 @@
         {%- endfor %}
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    {%- endif %}
+{%- endif %}
 {#-
   vim: syntax=jinja sw=2 ts=2
 -#}
diff --git a/jenkins/files/jobs/workflow.xml b/jenkins/files/jobs/workflow.xml
index 6ce817a..ebf8365 100644
--- a/jenkins/files/jobs/workflow.xml
+++ b/jenkins/files/jobs/workflow.xml
@@ -2,12 +2,12 @@
 {%- set job = salt['pillar.get']('jenkins:client:job:'+job_name) -%}
 
 {%- macro load_groovy_file() -%}
-{%- set groovy_file=client.dir.jenkins_jobs_root+'/'+job.script.repository+'/'+job.script.file -%}
+{%- set groovy_file=client.dir.jenkins_source_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 -%}
+{%- set groovy_file=client.dir.jenkins_source_root+'/'+lib.repository+'/'+lib.file -%}
 {%- include groovy_file -%}
 {%- endmacro -%}