diff --git a/roles/fedimg/templates/fedimg-conf.toml b/roles/fedimg/templates/fedimg-conf.toml
index 424a50e36f..195344cf7d 100644
--- a/roles/fedimg/templates/fedimg-conf.toml
+++ b/roles/fedimg/templates/fedimg-conf.toml
@@ -5,7 +5,7 @@ process_count = {{process_count}}
 active_services = ['aws']
 
 [aws]
-volume_size = {{aws_volume_size}}
+root_volume_size = {{aws_volume_size}}
 {% if env == 'staging' %}
 access_id = {{fedimg_aws_stg_access_id}}
 secret_key = {{fedimg_aws_stg_secret_key}}
@@ -17,17 +17,18 @@ base_region = 'us-east-1'
 regions = ['ap-northeast-2', 'us-east-2', 'ap-southeast-1', 'ap-southeast-2',
            'ap-south-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-2',
            'us-west-1', 'eu-central-1', 'ap-northeast-1']
+volume_types = ['standard', 'gp2']
 
 [rackspace]
-username = someuser
-api_key = secretk3y
+username = 'someuser'
+api_key = 'secretk3y'
 
 [gce]
-email = someacct@provider.com
-keypath = /path/to/pem/file
-project_id = someprojectid
+email = 'someacct@provider.com'
+keypath = '/path/to/pem/file'
+project_id = 'someprojectid'
 
 [hp]
-username = aperson
-password = somecoolpassword
-tenant = theprojectname
+username = 'aperson'
+password = 'somecoolpassword'
+tenant = 'theprojectname'
diff --git a/roles/fedimg/vars/main.yml b/roles/fedimg/vars/main.yml
index bdc9be994d..4c5eade8cc 100644
--- a/roles/fedimg/vars/main.yml
+++ b/roles/fedimg/vars/main.yml
@@ -1,5 +1,5 @@
-clean_up_on_failure: False
-delete_images_on_failure: False
+clean_up_on_failure: false
+delete_images_on_failure: false
 process_count: 1
 
 aws_volume_size: 6