diff --git a/cinder/meta/sphinx.yml b/cinder/meta/sphinx.yml
index 7456649..7e6ce9f 100644
--- a/cinder/meta/sphinx.yml
+++ b/cinder/meta/sphinx.yml
@@ -54,15 +54,21 @@
         version:
           name: "Version"
           value: {{ volume.version }}
+        {%- if pillar.cinder.volume.database is defined %}
         database_host:
           name: "Database"
           value: {{ volume.database.user }}@{{ volume.database.host }}:{{ volume.database.port }}//{{ volume.database.name }}
+        {%- endif %}
+        {%- if pillar.cinder.volume.message_queue is defined %}
         message_queue_ip:
           name: "Message queue"
           value: {{ volume.message_queue.user }}@{{ volume.message_queue.host }}:{{ volume.message_queue.port }}{{ volume.message_queue.virtual_host }}
+        {%- endif %}
+        {%- if pillar.cinder.volume.identity is defined %}
         identity_host:
           name: "Identity service"
           value: {{ volume.identity.user }}@{{ volume.identity.host }}:{{ volume.identity.port }}
+        {%- endif %}
         packages:
           value: |
             {%- for pkg in volume.pkgs %}