diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 6e8d183..33ecb10 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -17,8 +17,6 @@ setup:
     keystone-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/keystone.conf"
     keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
     nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
-  copyfiles:
-    "{snap}/usr/conf": "{snap_common}/etc/nginx"
   rchown:
     "{snap_common}/fernet-keys": "snap-keystone:snap-keystone"
     "{snap_common}/lib": "snap-keystone:snap-keystone"
diff --git a/snap/templates/keystone-nginx.conf.j2 b/snap/templates/keystone-nginx.conf.j2
index 975808a..d8e2f92 100644
--- a/snap/templates/keystone-nginx.conf.j2
+++ b/snap/templates/keystone-nginx.conf.j2
@@ -3,7 +3,7 @@ server {
     access_log {{ snap_common }}/log/nginx-access.log;
     error_log {{ snap_common }}/log/nginx-error.log;
     location / {
-        include uwsgi_params;
+        include {{ snap }}/usr/conf/uwsgi_params;
         uwsgi_param SCRIPT_NAME '';
         uwsgi_pass unix://{{ snap_common }}/run/admin.sock;
     }
@@ -13,7 +13,7 @@ server {
     access_log {{ snap_common }}/log/nginx-access.log;
     error_log {{ snap_common }}/log/nginx-error.log;
     location / {
-        include uwsgi_params;
+        include {{ snap }}/usr/conf/uwsgi_params;
         uwsgi_param SCRIPT_NAME '';
         uwsgi_pass unix://{{ snap_common }}/run/public.sock;
     }
diff --git a/snap/templates/nginx.conf.j2 b/snap/templates/nginx.conf.j2
index 653ff03..0193035 100644
--- a/snap/templates/nginx.conf.j2
+++ b/snap/templates/nginx.conf.j2
@@ -17,7 +17,7 @@ http {
         keepalive_timeout 65;
         types_hash_max_size 2048;
 
-        include {{ snap_common }}/etc/nginx/mime.types;
+        include {{ snap }}/usr/conf/mime.types;
         default_type application/octet-stream;
 
         ##