diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp
index 63066a9ee3..685eea0be1 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -179,6 +179,24 @@ class nodepool (
     require => User['nodepool'],
   }
 
+  # used for storage of d-i-b cached data
+  file { '/opt/dib_cache':
+    ensure  => directory,
+    mode    => '0755',
+    owner   => 'nodepool',
+    group   => 'nodepool',
+    require => User['nodepool'],
+  }
+
+  # used as TMPDIR during d-i-b image builds
+  file { '/opt/dib_tmp':
+    ensure  => directory,
+    mode    => '0755',
+    owner   => 'nodepool',
+    group   => 'nodepool',
+    require => User['nodepool'],
+  }
+
   file { '/var/log/nodepool':
     ensure  => directory,
     mode    => '0755',
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 47000752a2..5d4d615f79 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -1095,6 +1095,9 @@ diskimages:
       - nodepool-base
       - node-devstack
     release: trusty
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: devstack-precise-dib
     elements:
       - ubuntu
@@ -1104,6 +1107,9 @@ diskimages:
       - nodepool-base
       - node-devstack
     release: precise
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: devstack-centos7-dib
     elements:
       - centos7
@@ -1112,6 +1118,9 @@ diskimages:
       - puppet
       - nodepool-base
       - node-devstack
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: devstack-fedora21-dib
     elements:
       - fedora
@@ -1121,5 +1130,7 @@ diskimages:
       - node-devstack
     release: 21
     env-vars:
-      - DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
-      - BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
+      BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2