diff --git a/tasks/keystone_nginx.yml b/tasks/keystone_nginx.yml
index 1fb30787..cfed18cc 100644
--- a/tasks/keystone_nginx.yml
+++ b/tasks/keystone_nginx.yml
@@ -36,18 +36,6 @@
     - Manage LB
     - Restart web server
 
-- name: Ensure nginx does not listen on 80 port
-  replace:
-    path: /etc/nginx/nginx.conf
-    regexp: "{{ item.regexp }}"
-    replace: "{{ item.replace }}"
-    validate: nginx -t -c %s
-  with_items:
-    - regexp: '(\s+listen\s+)[\[,\],:]+80'
-      replace: '\1 [::1]:8008'
-    - regexp: '(\s+listen\s+)80'
-      replace: '\1 127.0.0.1:8008'
-
 - name: Ensure configuration directories exist
   file:
     path: "{{ item }}"
@@ -104,3 +92,18 @@
   notify:
     - Manage LB
     - Restart web server
+
+- name: Ensure nginx does not listen on 80 port
+  replace:
+    path: /etc/nginx/nginx.conf
+    regexp: "{{ item.regexp }}"
+    replace: "{{ item.replace }}"
+    validate: nginx -t -c %s
+  with_items:
+    - regexp: '(\s+listen\s+)[\[,\],:]+80'
+      replace: '\1 [::1]:8008'
+    - regexp: '(\s+listen\s+)80'
+      replace: '\1 127.0.0.1:8008'
+  notify:
+    - Manage LB
+    - Restart web server
diff --git a/templates/keystone_nginx.conf.j2 b/templates/keystone_nginx.conf.j2
index a8953999..daa12392 100644
--- a/templates/keystone_nginx.conf.j2
+++ b/templates/keystone_nginx.conf.j2
@@ -47,7 +47,7 @@ server {
     }
 
     location @yourapplication {
-        include     uwsgi_params;
+        include     /etc/nginx/uwsgi_params;
         uwsgi_pass  127.0.0.1:{{ keystone_uwsgi_ports[item]['socket'] }};
         uwsgi_param SCRIPT_NAME '';
 {% for header in keystone_extra_headers %}