diff --git a/tasks/upstream.yml b/tasks/upstream.yml
index 7b36d26..0cdea89 100644
--- a/tasks/upstream.yml
+++ b/tasks/upstream.yml
@@ -2,14 +2,14 @@
 
 - name: TEMPLATE | Deploy PHP upstream to Nginx
   template:
-    src: "etc/nginx/upstream/php.conf.j2"
+    src: "etc/nginx/conf.d/php.conf.j2"
     dest: "{{ nginx_etc_dir }}/conf.d/php.conf"
   when: nginx_php | length > 0
   notify: reload nginx
 
 - name: TEMPLATE | Deploy other upstreams
   template:
-    src: "etc/nginx/upstream/upstream.conf.j2"
+    src: "etc/nginx/conf.d/_upstream.conf.j2"
     dest: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
   with_items: "{{ nginx_upstreams }}"
   when: item.state is not defined or item.state == 'present'
diff --git a/templates/etc/nginx/upstream/upstream.conf.j2 b/templates/etc/nginx/conf.d/_upstream.conf.j2
similarity index 100%
rename from templates/etc/nginx/upstream/upstream.conf.j2
rename to templates/etc/nginx/conf.d/_upstream.conf.j2
diff --git a/templates/etc/nginx/upstream/php.conf.j2 b/templates/etc/nginx/conf.d/php.conf.j2
similarity index 100%
rename from templates/etc/nginx/upstream/php.conf.j2
rename to templates/etc/nginx/conf.d/php.conf.j2