diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 5c2dee6ed..937e22a27 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -6,7 +6,7 @@
     - { src: "server.conf",dest: "/etc/nginx/" }
     - { src: "nginx.conf",dest: "/etc/nginx/" }
     - { src: "ports.conf" , dest: "/etc/{{ apache_service }}/" }
-    - { src: "iiab.conf.j2",dest: "/etc/nginx/conf.d/iiab.conf" }
+    - { src: "iiab.conf.j2",dest: "{{ nginx_config_dir }}/iiab.conf" }
   when: nginx_enabled
 
 - name: Clean stale config files
@@ -14,8 +14,8 @@
       state: absent
       path: '{{ item.path }}'
   with_items:
-    - { path: "/etc/nginx/conf.d/usb-lib.conf" }
-    - { path: "/etc/nginx/conf.d/modules.conf" }
+    - { path: "{{ nginx_config_dir }}/usb-lib.conf" }
+    - { path: "{{ nginx_config_dir }}/modules.conf" }
 
 - name: Insure that apache2 is not running -- we may need port swap
   systemd:
diff --git a/roles/nginx/templates/server.conf b/roles/nginx/templates/server.conf
index e734bde1f..47467aad8 100644
--- a/roles/nginx/templates/server.conf
+++ b/roles/nginx/templates/server.conf
@@ -10,7 +10,7 @@ server {
       index  index.php index.html index.htm;
 
       # let individual services drop location blocks in conf.d
-      include /etc/nginx/conf.d/*;
+      include {{ nginx_config_dir }}/*;
  
       location ~ .*\.php$ {
           proxy_set_header X-Real-IP  $remote_addr;