diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index fdbe02d..2076ea4 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,9 +1,11 @@
 configs:
-  horizon_port: 80
-  horizon_secret_key: secret
+  horizon:
+    port: 80
+    secret_key: secret
 
-  horizon_wsgi_processes: 6
-  horizon_wsgi_threads: 15
+    wsgi:
+      processes: 6
+      threads: 15
 
 sources:
   openstack/horizon:
diff --git a/service/files/local_settings.j2 b/service/files/local_settings.j2
index ee9d9ed..f105cd3 100644
--- a/service/files/local_settings.j2
+++ b/service/files/local_settings.j2
@@ -121,7 +121,7 @@ LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
 # (usually behind a load-balancer). Either you have to make sure that a session
 # gets all requests routed to the same dashboard instance or you set the same
 # SECRET_KEY for all of them.
-SECRET_KEY = "{{ horizon_secret_key }}"
+SECRET_KEY = "{{ horizon.secret_key }}"
 
 # We recommend you use memcached for development; otherwise after every reload
 # of the django development server, you will have to login again. To use
diff --git a/service/files/openstack-dashboard.conf.j2 b/service/files/openstack-dashboard.conf.j2
index 017fbf1..63e4937 100644
--- a/service/files/openstack-dashboard.conf.j2
+++ b/service/files/openstack-dashboard.conf.j2
@@ -1,9 +1,9 @@
 {% set venv_path = '/var/lib/microservices/venv/lib/python2.7/site-packages' %}
 
-<VirtualHost *:{{ horizon_port }}>
+<VirtualHost *:{{ horizon.port }}>
     WSGIScriptAlias / {{ venv_path }}/openstack_dashboard/wsgi/django.wsgi
     WSGIScriptAlias /horizon {{ venv_path }}/openstack_dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess horizon user=horizon group=horizon processes={{ horizon_wsgi_processes }} threads={{ horizon_wsgi_threads }} python-path={{ venv_path }}
+    WSGIDaemonProcess horizon user=horizon group=horizon processes={{ horizon.wsgi.processes }} threads={{ horizon.wsgi.threads }} python-path={{ venv_path }}
     WSGIProcessGroup horizon
 
     Alias /static {{ venv_path }}/static
diff --git a/service/horizon.yaml b/service/horizon.yaml
index 9c69f79..9fc9c30 100644
--- a/service/horizon.yaml
+++ b/service/horizon.yaml
@@ -1,7 +1,7 @@
 service:
   name: horizon
   ports:
-    - {{ horizon_port }}
+    - {{ horizon.port }}
   containers:
     - name: horizon
       image: horizon