diff --git a/modules/jenkins_slave/files/bazaar.conf b/modules/jenkins_slave/files/bazaar.conf
new file mode 100644
index 0000000000..27b90b7c0c
--- /dev/null
+++ b/modules/jenkins_slave/files/bazaar.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+email = OpenStack Jenkins <jenkins@openstack.org>
+launchpad_username = hudson-openstack
+
diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp
index 62a0e324cd..67f1cb376c 100644
--- a/modules/jenkins_slave/manifests/jenkinsuser.pp
+++ b/modules/jenkins_slave/manifests/jenkinsuser.pp
@@ -86,9 +86,11 @@ define jenkinsuser($ensure = present) {
     owner => 'jenkins',
     group => 'jenkins',
     mode => 640,
-    content => "[DEFAULT]\nemail = OpenStack Jenkins <jenkins@openstack.org>\n",
     ensure => 'present',
     require => File['jenkinsbazaardir'],
+    source => [
+                "puppet:///modules/jenkins_slave/bazaar.conf",
+              ],
   }
 
   file { 'jenkinsbazaarauth':