diff --git a/handlers/main.yml b/handlers/main.yml
index b506ef5..ebf0282 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 # Copyright 2015, Rackspace US, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/tasks/gnocchi_init_systemd.yml b/tasks/gnocchi_init_systemd.yml
index e156b62..285064a 100644
--- a/tasks/gnocchi_init_systemd.yml
+++ b/tasks/gnocchi_init_systemd.yml
@@ -19,7 +19,7 @@
     state: directory
     owner: "{{ system_user }}"
     group: "{{ system_group }}"
-    mode: "2755"
+    mode: "02755"
   with_items:
     - { path: "/var/run" }
     - { path: "/var/lock" }
diff --git a/templates/gnocchi-wsgi.py.j2 b/templates/gnocchi-wsgi.py.j2
index e73712d..5ebaac4 100644
--- a/templates/gnocchi-wsgi.py.j2
+++ b/templates/gnocchi-wsgi.py.j2
@@ -19,13 +19,6 @@ activate_this = os.path.expanduser("{{ gnocchi_venv_bin }}/activate_this.py")
 execfile(activate_this, dict(__file__=activate_this))
 {% endif %}
 
-from oslo_config import cfg
-
-from gnocchi import service
 from gnocchi.rest import app
 
-# Initialize the oslo configuration library and logging
-conf = service.prepare_service()
-# The pecan debugger cannot be used in wsgi mode
-conf.set_default('pecan_debug', False, group='api')
-application = app.load_app(conf)
+application = app.build_wsgi_app()
\ No newline at end of file
diff --git a/templates/gnocchi.conf.j2 b/templates/gnocchi.conf.j2
index 4585453..c1ba92a 100644
--- a/templates/gnocchi.conf.j2
+++ b/templates/gnocchi.conf.j2
@@ -4,10 +4,6 @@
 debug = {{ debug }}
 fatal_deprecations = {{ gnocchi_fatal_deprecations }}
 
-[api]
-host = {{ gnocchi_service_address }}
-port = {{ gnocchi_service_port }}
-
 {% if gnocchi_ssl_external | bool %}
 [oslo_middleware]
 secure_proxy_ssl_header = {{ gnocchi_secure_proxy_ssl_header }}
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index 8640493..126c49c 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -6,7 +6,7 @@ gnocchi_developer_mode: true
 gnocchi_galera_password: "secrete"
 gnocchi_service_password: "secrete"
 gnocchi_galera_address: 10.100.100.2
-gnocchi_use_mod_wsgi: false
+gnocchi_use_mod_wsgi: true
 gnocchi_ssl_external: false
 keystone_admin_tenant_name: admin
 keystone_admin_user_name: admin