diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 1c1c808..5927fdd 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -1,5 +1,5 @@
 parameters:
-  nginx:
+  opencontrail:
     _support:
       collectd:
         enabled: false
diff --git a/opencontrail/meta/sphinx.yml b/opencontrail/meta/sphinx.yml
index 42d29dd..bb41eab 100644
--- a/opencontrail/meta/sphinx.yml
+++ b/opencontrail/meta/sphinx.yml
@@ -58,7 +58,7 @@
           value: {{ control.version }}
         database_host:
           name: "Database members"
-          value: {%- for member in control.members %}{{ member.host }},{%- endfor %}
+          value: {% for member in control.members %}{{ member.host }},{% endfor %}
         packages:
           value: |
             {%- for pkg in control.pkgs %}
@@ -72,7 +72,7 @@
       name: database
       param:
         bind:
-          value: {{ database.bind.address }}{{ database.bind.port }}
+          value: {{ database.bind.host }}{{ database.bind.port }}
         discovery:
           name: "Discovery host"
           value: {{ database.discovery.host }}
@@ -84,7 +84,7 @@
           value: {{ database.data_dirs }}
         database_host:
           name: "Database members"
-          value: {%- for member in database.members %}{{ member.host }},{%- endfor %}
+          value: {% for member in database.members %}{{ member.host }},{% endfor %}
         packages:
           value: |
             {%- for pkg in database.pkgs %}
@@ -99,9 +99,6 @@
       param:
         bind:
           value: {{ web.bind.address }}
-        discovery:
-          name: "Discovery host"
-          value: {{ web.discovery.host }}
         analytics:
           name: "Analytics host"
           value: {{ web.analytics.host }}
@@ -116,7 +113,7 @@
           value: {{ web.identity.user }}@{{ web.identity.host }}:{{ web.identity.port }}
         database_host:
           name: "Database members"
-          value: {%- for member in web.members %}{{ member.host }},{%- endfor %}
+          value: {% for member in web.members %}{{ member.host }},{% endfor %}
         packages:
           value: |
             {%- for pkg in web.pkgs %}