diff --git a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
index 9fc937e8e..b2f4e730c 100644
--- a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
@@ -5,5 +5,7 @@ deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}"
 dib_os_element: "ubuntu"
 dib_env_vars:
   ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements"
+  http_proxy: "{{ lookup('env','http_proxy') }}"
+  https_proxy: "{{ lookup('env','https_proxy') }}"
 # extra_dib_elements is a space separated list of elements.
 extra_dib_elements: ""
diff --git a/playbooks/roles/ironic-install/defaults/main.yml b/playbooks/roles/ironic-install/defaults/main.yml
index 38cd6b841..f52b6d49d 100644
--- a/playbooks/roles/ironic-install/defaults/main.yml
+++ b/playbooks/roles/ironic-install/defaults/main.yml
@@ -6,13 +6,6 @@ http_boot_folder: /httpboot
 nginx_port: 8080
 ironicclient_source_install: false
 shade_source_install: true
-# Configuration information for diskimage-builder
-dib_os_element: "ubuntu"
-dib_env_vars:
-  DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive"
-  ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements"
-# extra_dib_elements is a space separated list of elements.
-extra_dib_elements: ""
 # Setting to utilize diskimage-builder to create a bootable image.
 create_image_via_dib: true
 # Setting to prepend a partition image with a boot sector and partition table.