diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
index 1c746521c..3439346f8 100644
--- a/ansible/install/group_vars/all.yml
+++ b/ansible/install/group_vars/all.yml
@@ -340,12 +340,10 @@ statsd_enabled: False
 ########################################
 # Port for Shaker (5555 should suffice)
 shaker_port: 5555
-# Should choose m1.small or larger
-shaker_flavor: m1.small
-# Shaker centos image builder template
-shaker_image: "{{shaker_venv}}/lib/python2.7/site-packages/shaker/resources/image_builder_templates/centos.yaml"
+# Base image for disk image builder
+shaker_image: centos7
 shaker_region: regionOne
-shaker_dns_nameserver: "{{ dns_server }}"
+
 
 #######################################
 # Connman Configuration
diff --git a/ansible/install/shaker_build.yml b/ansible/install/shaker_build.yml
index f0a1e356e..5f5399d9d 100644
--- a/ansible/install/shaker_build.yml
+++ b/ansible/install/shaker_build.yml
@@ -19,7 +19,7 @@
     - name: Build shaker image
       shell: >
              source {{ overcloudrc }}; source {{ shaker_venv }}/bin/activate;
-             shaker-image-builder --image-builder-mode dib --image-builder-distro centos7
-             --os-region-name {{ shaker_region }}
+             shaker-image-builder --image-builder-mode dib --image-builder-distro
+              {{shaker_image}} --os-region-name {{ shaker_region }}
       register: image_result
       failed_when: image_result.rc != 0