diff --git a/ceilometer/files/juno/ceilometer-agent.conf.Debian b/ceilometer/files/juno/ceilometer-agent.conf.Debian
index d075c62..6ce7729 100644
--- a/ceilometer/files/juno/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/juno/ceilometer-agent.conf.Debian
@@ -972,7 +972,7 @@
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
-os_endpoint_type={{ server.identity.get('endpoint_type', 'publicURL') }}
+os_endpoint_type={{ agent.identity.get('endpoint_type', 'publicURL') }}
 
 # Disables X.509 certificate validation when an SSL connection
 # to Identity Service is established. (boolean value)
diff --git a/ceilometer/files/kilo/ceilometer-agent.conf.Debian b/ceilometer/files/kilo/ceilometer-agent.conf.Debian
index f9f58e1..6152ba4 100644
--- a/ceilometer/files/kilo/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/kilo/ceilometer-agent.conf.Debian
@@ -502,7 +502,7 @@
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
-os_endpoint_type={{ server.identity.get('endpoint_type', 'publicURL') }}
+os_endpoint_type={{ agent.identity.get('endpoint_type', 'publicURL') }}
 
 # Disables X.509 certificate validation when an SSL connection
 # to Identity Service is established. (boolean value)
diff --git a/ceilometer/files/liberty/ceilometer-agent.conf.Debian b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
index fad8adf..0234a65 100644
--- a/ceilometer/files/liberty/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
@@ -502,7 +502,7 @@
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
-os_endpoint_type={{ server.identity.get('endpoint_type', 'publicURL') }}
+os_endpoint_type={{ agent.identity.get('endpoint_type', 'publicURL') }}
 
 # Disables X.509 certificate validation when an SSL connection
 # to Identity Service is established. (boolean value)
diff --git a/ceilometer/files/mitaka/ceilometer-agent.conf.Debian b/ceilometer/files/mitaka/ceilometer-agent.conf.Debian
index fad8adf..0234a65 100644
--- a/ceilometer/files/mitaka/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/mitaka/ceilometer-agent.conf.Debian
@@ -502,7 +502,7 @@
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
-os_endpoint_type={{ server.identity.get('endpoint_type', 'publicURL') }}
+os_endpoint_type={{ agent.identity.get('endpoint_type', 'publicURL') }}
 
 # Disables X.509 certificate validation when an SSL connection
 # to Identity Service is established. (boolean value)