diff --git a/sphinx/files/reclass/source/overview/endpoints.rst b/sphinx/files/reclass/source/overview/endpoints.rst
index d13ad19..8ab919c 100644
--- a/sphinx/files/reclass/source/overview/endpoints.rst
+++ b/sphinx/files/reclass/source/overview/endpoints.rst
@@ -14,7 +14,7 @@
       - **Service**
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
 {%- for service_name, service in node_grains.get('sphinx_doc', {}).iteritems() %}
-{%- for role_name, role in service.role.iteritems() %}
+{%- for role_name, role in service.get('role', {}).iteritems() %}
 {%- for endpoint_name, endpoint in role.get('endpoint', {}).iteritems() %}
    *  - {{ endpoint.type }}
       - {{ endpoint.address }}
diff --git a/sphinx/meta/sphinx.yml b/sphinx/meta/sphinx.yml
index 5359ca9..09499df 100644
--- a/sphinx/meta/sphinx.yml
+++ b/sphinx/meta/sphinx.yml
@@ -3,7 +3,7 @@
 description: Sphinx is a tool that makes it easy to create intelligent and beautiful documentation.
 documentation: http://sphinx-doc.org/tutorial.html
 role:
-  system:
+  server:
     name: server
     param:
       version: