diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2
index e3806a39bb..a7c549519a 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2
@@ -688,8 +688,8 @@ openshift_hosted_metrics_deploy=true
 #openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{ openshift_image_tag }"
 #
 # StorageClass
-# openshift_storageclass_name=gp2
-# openshift_storageclass_parameters={'type': 'gp2', 'encrypted': 'false'}
+# openshift_storageclass_name=gp3
+# openshift_storageclass_parameters={'type': 'gp3', 'encrypted': 'false'}
 # openshift_storageclass_mount_options=['dir_mode=0777', 'file_mode=0777']
 # openshift_storageclass_reclaim_policy="Delete"
 #
diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2
index 35e63867fa..e694dd6e2b 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2
@@ -669,8 +669,8 @@ openshift_hosted_metrics_deploy=true
 #openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{ openshift_image_tag }"
 #
 # StorageClass
-# openshift_storageclass_name=gp2
-# openshift_storageclass_parameters={'type': 'gp2', 'encrypted': 'false'}
+# openshift_storageclass_name=gp3
+# openshift_storageclass_parameters={'type': 'gp3', 'encrypted': 'false'}
 # openshift_storageclass_mount_options=['dir_mode=0777', 'file_mode=0777']
 # openshift_storageclass_reclaim_policy="Delete"
 #
diff --git a/roles/fedimg/templates/fedimg-conf.toml b/roles/fedimg/templates/fedimg-conf.toml
index e849271289..65bd311033 100644
--- a/roles/fedimg/templates/fedimg-conf.toml
+++ b/roles/fedimg/templates/fedimg-conf.toml
@@ -24,7 +24,7 @@ regions = [ 'af-south-1', 'eu-north-1', 'ap-south-1', 'eu-west-3',  'eu-west-2',
             'ap-northeast-1', 'sa-east-1', 'ca-central-1', 'ap-east-1', 'ap-southeast-1',
             'ap-southeast-2', 'ap-southeast-3', 'eu-central-1', 'us-east-1', 'us-east-2',
             'us-west-1', 'us-west-2' ]
-volume_types = ['standard', 'gp2']
+volume_types = ['standard', 'gp2', 'gp3']
 
 [rackspace]
 username = 'someuser'