diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml
index bfad55a..ed5272e 100644
--- a/roles/bootstrap_puppetmaster/tasks/main.yml
+++ b/roles/bootstrap_puppetmaster/tasks/main.yml
@@ -51,6 +51,11 @@
     src=zuul.yaml.j2 
     dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_zuul'][0] }}.yaml
 
+- name: Deploy Jenkins master server template for hiera
+  template: >
+    src=jenkins.yaml.j2 
+    dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_jenkins'][0] }}.yaml
+
 - name: Start puppet agent service
   service: name=puppet enabled=yes state=started
 
diff --git a/roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2 b/roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2
new file mode 100644
index 0000000..16dc933
--- /dev/null
+++ b/roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2
@@ -0,0 +1,8 @@
+---
+classes:
+  - jenkins::master 
+
+jenkins::master::ssl_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
+jenkins::master::ssl_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
+jenkins::master::jenkins_ssh_private_key: "%{hiera('jenkins_ssh_private_key')}"
+jenkins::master::jenkins_ssh_public_key: "%{hiera('jenkins_ssh_public_key')}"