diff --git a/manifests/builder.pp b/manifests/builder.pp
index 36c1a44..20cdb29 100644
--- a/manifests/builder.pp
+++ b/manifests/builder.pp
@@ -23,6 +23,8 @@ class nodepool::builder(
   $upload_workers = '4',
 ) {
 
+  include ::diskimage_builder
+
   file { '/etc/init.d/nodepool-builder':
     ensure => present,
     mode   => '0555',
diff --git a/manifests/init.pp b/manifests/init.pp
index b40dfb5..57ff1a7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -107,8 +107,6 @@ class nodepool (
     source   => $git_source_repo,
   }
 
-  include ::diskimage_builder
-
   include ::pip
   exec { 'install_nodepool' :
     command     => 'pip install -U /opt/nodepool',