diff --git a/ext/openstack_deploy/openstack_gnocchi_overrides.yml.example b/ext/openstack_deploy/openstack_gnocchi_overrides.yml.example
index 743ebc6..a7542c2 100644
--- a/ext/openstack_deploy/openstack_gnocchi_overrides.yml.example
+++ b/ext/openstack_deploy/openstack_gnocchi_overrides.yml.example
@@ -17,6 +17,11 @@
 ## for now. An improved mechanism for this is pending.
 
 ## Demonstrating the expected configurations necessary to use gnocchi as the ceilometer dispatcher
+gnocchi_service_proto: http
+gnocchi_service_port: 8041
+gnocchi_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(gnocchi_service_proto) }}"
+gnocchi_service_publicurl: "{{ gnocchi_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ gnocchi_service_port }}"
+
 gnocchi_ceilo_conf_overrides:
   default:
     meter_dispatchers: gnocchi
@@ -40,17 +45,20 @@ gnocchi_ceilo_swift_conf_overrides:
     filter_project: gnocchi_swift
 
 ## Demonstrating the expected configurations necessary to use swift for storage
+## When using keystone auth v2 some entries will need to be adjusted
 gnocchi_swift_conf_overrides:
   storage:
     driver: swift
     swift_auth_version: 3
-    swift_authurl: "{{ keystone_service_internaluri }}"
-    swift_user: "service:{{ gnocchi_service_user_name }}"
+    swift_authurl: "{{ keystone_service_internalurl }}"
+    swift_endpoint_type: internalURL
+    swift_user: "{{ gnocchi_service_user_name }}"
     swift_key: "{{ gnocchi_service_password }}"
-    swift_region_name: "{{ glance_service_region }}"
-    swift_user_domain: default
-    swift_project_domain: default
-    swift_tenant_name: default
+    swift_region_name: "{{ gnocchi_service_region }}"
+    swift_user_domain: "{{ gnocchi_service_user_domain_id }}"
+    swift_project_domain: "{{ gnocchi_service_project_domain_id }}"
+    swift_tenant_name: "{{ gnocchi_service_project_name }}"
+    swift_container_prefix: gnocchi
 
 ## Demonstrating the expected configurations necessary to use ceph for storage
 gnocchi_ceph_conf_overrides:
diff --git a/library/config_template b/library/config_template
index 0a4bc31..0c343aa 100644
--- a/library/config_template
+++ b/library/config_template
@@ -7,10 +7,10 @@ version_added: 1.9.2
 short_description: Renders template files providing a create/update override interface
 description:
   - The module contains the template functionality with the ability to override items
-    in config, in transit, though the use of an simple dictionary without having to
+    in config, in transit, through the use of a simple dictionary without having to
     write out various temp files on target machines. The module renders all of the
     potential jinja a user could provide in both the template file and in the override
-    dictionary which is ideal for deployers whom may have lots of different configs
+    dictionary which is ideal for deployers who may have lots of different configs
     using a similar code base.
   - The module is an extension of the **copy** module and all of attributes that can be
     set there are available to be set here.
diff --git a/templates/gnocchi.conf.j2 b/templates/gnocchi.conf.j2
index b6af336..eadd2ee 100644
--- a/templates/gnocchi.conf.j2
+++ b/templates/gnocchi.conf.j2
@@ -38,15 +38,6 @@ check_revocations_for_cached = False
 [storage]
 driver = {{ gnocchi_storage_driver }}
 coordination_url = {{ gnocchi_coordination_url }}
-{% if gnocchi_storage_driver == 'swift' %}
-swift_auth_version = 3
-swift_authurl = "{{ keystone_service_internaluri }}"
-swift_user: = "service:{{ gnocchi_service_user_name }}"
-swift_key: = "{{ gnocchi_service_password }}"
-swift_user_domain = {{ gnocchi_service_user_domain_id }}
-swift_project_domain = {{ gnocchi_service_project_domain_id }}
-swift_tenant_name: = {{ gnocchi_service_project_name }}
-{% endif %}
 
 [metricd]
 # Number of workers for Gnocchi metric daemons. By default the available number
@@ -84,7 +75,8 @@ swift_tenant_name: = {{ gnocchi_service_project_name }}
 ############
 file_basepath = /var/lib/gnocchi
 file_basepath_tmp = ${file_basepath}/tmp
-{% else %}
+{% endif %}
+{% if gnocchi_storage_driver == 'ceph' %}
 ############
 ## Ceph Storage
 ############
@@ -99,36 +91,7 @@ file_basepath_tmp = ${file_basepath}/tmp
 
 # Ceph configuration file. (string value)
 #ceph_conffile = /etc/ceph/ceph.conf
-
-############
-## Swift Storage
-############
-# Swift authentication version to user. (string value)
-#swift_auth_version = 1
-
-# Swift pre-auth URL. (string value)
-#swift_preauthurl = <None>
-
-# Swift auth URL. (string value)
-#swift_authurl = http://localhost:8080/auth/v1.0
-
-# Swift token to user to authenticate. (string value)
-#swift_preauthtoken = <None>
-
-# Swift user. (string value)
-#swift_user = admin:admin
-
-# Swift key/password. (string value)
-#swift_key = admin
-
-# Swift tenant name, only used in v2 auth. (string value)
-#swift_tenant_name = <None>
-
-# Prefix to namespace metric containers. (string value)
-#swift_container_prefix = gnocchi
-
-# Connection timeout in seconds. (integer value)
-#swift_timeout = 300
+{% endif %}
 
 ############
 ## InfluxDB Storage
@@ -153,4 +116,3 @@ file_basepath_tmp = ${file_basepath}/tmp
 # InfluxDB ingests data in asynchroneous ways. Set to True to wait data are
 # ingested. (boolean value)
 #influxdb_block_until_data_ingested = false
-{% endif %}