diff --git a/playbooks/install.yaml b/playbooks/install.yaml
index b29dd4aa9..d10a033a9 100644
--- a/playbooks/install.yaml
+++ b/playbooks/install.yaml
@@ -7,7 +7,7 @@
   roles:
     - { role: bifrost-prep-for-install, when: skip_install is not defined }
     - ironic-install
-    - { role: bifrost-create-dib-image, when: create_image_via_dib == true and transform_boot_image == false }
+    - { role: bifrost-create-dib-image, dib_imagename: deploy_image, dib_imagetype: "qcow2", dib_os_element: "debian", dib_elements: "vm serial-console simple-init", when: create_image_via_dib == true and transform_boot_image == false }
     - { role: bifrost-create-bootable-image, when: create_image_via_dib == false and transform_boot_image == true }
   environment:
     http_proxy: "{{ lookup('env','http_proxy') }}"
diff --git a/playbooks/inventory/group_vars/all b/playbooks/inventory/group_vars/all
index 83fdbf74e..f6974d37b 100644
--- a/playbooks/inventory/group_vars/all
+++ b/playbooks/inventory/group_vars/all
@@ -27,6 +27,8 @@ deploy_image_filename: "deployment_image.qcow2"
 deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}"
 # Setting to utilize diskimage-builder to create a bootable image.
 create_image_via_dib: true
+# Add any extra elements you wish to have in the disk image
+extra_dib_elements: ""
 # Transform boot image is intended for use with the Ubuntu trusty image.  It makes the image bootable by installing Grub.
 # Setting to prepend a partition image with a boot sector and partition table.
 transform_boot_image: false
diff --git a/playbooks/roles/bifrost-create-dib-image/README.md b/playbooks/roles/bifrost-create-dib-image/README.md
index 7ef78c4c6..9dc81dcec 100644
--- a/playbooks/roles/bifrost-create-dib-image/README.md
+++ b/playbooks/roles/bifrost-create-dib-image/README.md
@@ -1,7 +1,7 @@
 bifrost-create-dib-image
 ========================
 
-This role uses diskimage-builder to create a bootable disk image.
+This role uses diskimage-builder to create a bootable disk image or ramdisk.
 
 Requirements
 ------------
@@ -13,6 +13,10 @@ This role requires:
 Role Variables
 --------------
 
+The role can use the disk-image-create or ramdisk-image-create scripts. Which script is used is controlled by the build_ramdisk variable. The default is false.
+
+build_ramdisk: false
+
 The dib_env_vars are settings for the diskimage-builder environment variables which allow settings to be passed to elements that are being utilized to build a disk image.  More information on diskimage-builder can be found at http://git.openstack.org/cgit/openstack/diskimage-builder/.  Additionally, an extra_dib_elements setting exists which is a space separated list of elements to incorporate into the image.
 
 dib_env_vars:
diff --git a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
index b2f4e730c..133a8f971 100644
--- a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
@@ -1,11 +1,15 @@
 ---
-http_boot_folder: /httpboot
-deploy_image_filename: "deployment_image.qcow2"
-deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}"
-dib_os_element: "ubuntu"
+dib_os_element: "debian"
 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: ""
+build_ramdisk: false
+dib_trace: false
+dib_uncompressed: false
+dib_clearenv: false
+dib_notmpfs: false
+dib_offline: false
+dib_skipbase: false
diff --git a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
index d593b7d19..6cf18fae1 100644
--- a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
@@ -15,10 +15,93 @@
 ---
 # If attempting to utilize a base Ubuntu image, diskimage-builder
 # is the recommended, and default path.
-- name: "Test if deploy image is present"
-  stat: path={{ deploy_image }}
+- name: "Test if image is present"
+  stat: path={{ dib_imagename }}
   register: test_image_present
+- name: "Build tracing (-x) option for disk-image-create"
+  set_fact:
+    dib_trace_arg: "-x"
+  when: dib_trace == true
+- name: "Build uncompressed (-u) option for disk-image-create"
+  set_fact:
+    dib_uncompressed_arg: "-u"
+  when: dib_uncompressed == true
+- name: "Build clear environment (-c) option for disk-image-create"
+  set_fact:
+    dib_clearenv_arg: "-c"
+  when: dib_clearenv == true
+- name: "Build no tmpfs (--no-tmpfs) option for disk-image-create"
+  set_fact:
+    dib_notmpfs_arg: "--no-tmpfs"
+  when: dib_notmpfs == true
+- name: "Build offline (--offline) option for disk-image-create"
+  set_fact:
+    dib_offline_arg: "--offline"
+  when: dib_offline == true
+- name: "Build skip default base element (-n) option for disk-image-create"
+  set_fact:
+    dib_skipbase_arg: "-n"
+  when: dib_skipbase == true
+- name: "Build architecture (-a) option for disk-image-create"
+  set_fact:
+    dib_arch_arg: "-a {{dib_arch}}"
+  when: dib_arch is defined
+- name: "Build image name (-o) option for disk-image-create"
+  set_fact:
+    dib_imagename_arg: "-o {{dib_imagename}}"
+  when: dib_imagename is defined
+- name: "Build image type (-t) option for disk-image-create"
+  set_fact:
+    dib_imagetype_arg: "-t {{dib_imagetype}}"
+  when: dib_imagetype is defined
+- name: "Build image size (--image-size) option for disk-image-create"
+  set_fact:
+    dib_imagesize_arg: "--image-size {{dib_imagesize}}"
+  when: dib_imagesize is defined
+- name: "Build image cache (--image-cache) option for disk-image-create"
+  set_fact:
+    dib_imagecache_arg: "--image-cache {{dib_imagecache}}"
+  when: dib_imagecache is defined
+- name: "Build max online resize (--max-online-resize) option for disk-image-create"
+  set_fact:
+    dib_maxresize_arg: "--max-online-resize {{dib_maxresize}}"
+  when: dib_maxresize is defined
+- name: "Build minimum tmpfs size (--min-tmpfs) option for disk-image-create"
+  set_fact:
+    dib_mintmpfs_arg: "--min-tmpfs {{dib_mintmpfs}}"
+  when: dib_mintmpfs is defined
+- name: "Build mkfs options (--mkfs-options) option for disk-image-create"
+  set_fact:
+    dib_mkfsfopts_arg: "-mkfs-options {{dib_mkfsopts}}"
+  when: dib_mkfsopts is defined
+- name: "Build qemu image options (--qemu-img-options) option for disk-image-create"
+  set_fact:
+    dib_qemuopts_arg: "--qemu-img-options {{dib_qemuopts}}"
+  when: dib_qemuopts is defined
+- name: "Build root label (--root-label) option for disk-image-create"
+  set_fact:
+    dib_rootlabel_arg: "--root-label {{dib_rootlabel}}"
+  when: dib_rootlabel is defined
+- name: "Build ramdisk element (--ramdisk-element) option for disk-image-create"
+  set_fact:
+    dib_rdelement_arg: "--ramdisk-element {{dib_rdelement}}"
+  when: dib_rdelement is defined
+- name: "Build install type (--install-type) option for disk-image-create"
+  set_fact:
+    dib_installtype_arg: "-t {{dib_installtype}}"
+  when: dib_installtype is defined
+- name: "Build packages (-p) option for disk-image-create"
+  set_fact:
+    dib_packages_arg: "-p {{dib_packages}}"
+  when: dib_packages is defined
+- name: "Build argument list"
+  set_fact:
+    dib_arglist: "{{dib_trace_arg|default('')}} {{dib_uncompressed_arg|default('')}} {{dib_clearenv_arg|default('')}} {{dib_notmpfs_arg|default('')}} {{dib_offline_arg|default('')}} {{dib_skipbase_arg|default('')}} {{dib_arch_arg|default('')}} {{dib_imagename_arg|default('')}} {{dib_imagetype_arg|default('')}} {{dib_imagesize_arg|default('')}} {{dib_imagecache_arg|default('')}} {{dib_maxresize_arg|default('')}} {{dib_mintmpfs_arg|default('')}} {{dib_mkfsopts_arg|default('')}} {{dib_qemuopts_arg|default('')}} {{dib_rootlabel_arg|default('')}} {{dib_rdelement_arg|default('')}} {{dib_installtype_arg|default('')}} {{dib_packages_arg|default('')}} {{dib_os_element}} {{dib_elements|default('')}}"
 - name: "Initiate image build"
-  shell: disk-image-create -a amd64 -o "{{http_boot_folder}}/{{deploy_image_filename}}" -t qcow2 "{{dib_os_element}}" vm serial-console simple-init "{{ extra_dib_elements}}"
+  command: disk-image-create {{dib_arglist}}
   environment: dib_env_vars
-  when: test_image_present.stat.exists == false
+  when: test_image_present.stat.exists == false and build_ramdisk == false
+- name: "Initiate ramdisk build"
+  command: ramdisk-image-create {{dib_arglist}}
+  environment: dib_env_vars
+  when: test_image_present.stat.exists == false and build_ramdisk == true
diff --git a/playbooks/test-bifrost-dynamic.yaml b/playbooks/test-bifrost-dynamic.yaml
index 7e445de62..c74e417c7 100644
--- a/playbooks/test-bifrost-dynamic.yaml
+++ b/playbooks/test-bifrost-dynamic.yaml
@@ -50,7 +50,7 @@
     - role: ironic-install
       cleaning: false
       testing: true
-    - { role: bifrost-create-dib-image, when: create_image_via_dib == true and transform_boot_image == false }
+    - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_elements: "vm serial-console simple-init {{extra_dib_elements}}", when: create_image_via_dib == true and transform_boot_image == false }
     - { role: bifrost-create-bootable-image, when: create_image_via_dib == false and transform_boot_image == true }
   environment:
     http_proxy: "{{ lookup('env','http_proxy') }}"