diff --git a/salt/common/init.sls b/salt/common/init.sls
index ab6babfd9..be119a651 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -44,13 +44,20 @@ toosmooth/so-core:test2:
 
 # Drop the correct nginx config based on role
 
+nginxconfdir:
+  file.directory:
+    - name: /opt/so/conf/nginx
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 nginxconf:
   file.managed:
     - name: /opt/so/conf/nginx/nginx.conf
     - user: 939
     - group: 939
     - template: jinja
-    - source: salt://conf/nginx/nginx.conf.{{ grains.role }}
+    - source: salt://common/nginx/nginx.conf.{{ grains.role }}
 
 # Start the core docker
 so-core:
diff --git a/salt/common/nginx/nginx.conf.master b/salt/common/nginx/nginx.conf.so-master
similarity index 100%
rename from salt/common/nginx/nginx.conf.master
rename to salt/common/nginx/nginx.conf.so-master