diff --git a/ansible/install/browbeat.yml b/ansible/install/browbeat.yml
index f95065787..6c0046d7a 100644
--- a/ansible/install/browbeat.yml
+++ b/ansible/install/browbeat.yml
@@ -13,8 +13,8 @@
     - perfkitbenchmarker
     - rally
     - shaker
-    - flavors
-    - images
+    - { role: flavors, when: browbeat_create_flavors}
+    - { role: images, when: browbeat_upload_guest_images}
     - { role: workloads, when: install_browbeat_workloads}
   environment: "{{proxy_env}}"
 
diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
index 26cadf3b6..1e4d8a591 100644
--- a/ansible/install/group_vars/all.yml
+++ b/ansible/install/group_vars/all.yml
@@ -85,10 +85,13 @@ browbeat_workloads:
 ########################################
 # Other Install Configuration Items
 ########################################
+# Toggle creating flavors:
+browbeat_create_flavors: true
 
 # Guest images for the Overcloud
 # Note hash key name must match intended name for image upload to
 # work consistently (Ex. images['cirros'].name == 'cirros')
+browbeat_upload_guest_images: true
 browbeat_guest_images:
   centos7:
     name: centos7