diff --git a/nginx/files/nginx.conf b/nginx/files/nginx.conf
index ecdc059..1f657a5 100644
--- a/nginx/files/nginx.conf
+++ b/nginx/files/nginx.conf
@@ -1,9 +1,10 @@
-user www-data;
-worker_processes 4;
+{%- from "nginx/map.jinja" import server with context -%}
+user {{ server.user }};
+worker_processes {{ server.get('worker', {}).get('processes', 'auto') }};
 pid /run/nginx.pid;
 
 events {
-        worker_connections 768;
+        worker_connections {{ server.get('worker', {}).get('connections', '1024') }};
         # multi_accept on;
 }
 
@@ -18,7 +19,7 @@
         tcp_nodelay on;
         keepalive_timeout 65;
         types_hash_max_size 2048;
-        # server_tokens off;
+        server_tokens {% if server.get('tokens', False) %}on{% else %}off{% endif %};
 
         server_names_hash_bucket_size 128;
         # server_name_in_redirect off;
@@ -69,7 +70,7 @@
         ##
 
         include /etc/nginx/conf.d/*.conf;
-        include /etc/nginx/sites-enabled/*;
+        include /etc/nginx/sites-enabled/*.conf;
 }
 
 
diff --git a/nginx/files/sensu.conf b/nginx/files/sensu.conf
index d9417c3..9a37de8 100644
--- a/nginx/files/sensu.conf
+++ b/nginx/files/sensu.conf
@@ -6,7 +6,7 @@
   subscribers:
   - local-nginx-server
 local_nginx_server_worker_procs:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u www-data -c 1:20"
+  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u {{ server.user }} -c 1:20"
   interval: 60
   occurrences: 1
   subscribers:
@@ -22,4 +22,4 @@
   - remote-network
 {%- endif %}
 {%- endif %}
-{%- endfor %}
\ No newline at end of file
+{%- endfor %}
diff --git a/nginx/map.jinja b/nginx/map.jinja
index a27b245..6f970e7 100644
--- a/nginx/map.jinja
+++ b/nginx/map.jinja
@@ -3,12 +3,14 @@
     'Debian': {
         'pkgs': ['nginx', 'apache2-utils'],
         'service': 'nginx',
+        'user': 'www-data',
         'vhost_dir': '/etc/nginx/sites-available',
         'log_dir': '/var/log/nginx',
     },
     'RedHat': {
         'pkgs': ['nginx', 'httpd-tools'],
         'service': 'nginx',
+        'user': 'nginx',
         'vhost_dir': '/etc/nginx/conf.d',
         'log_dir': '/var/log/nginx',
     },
diff --git a/nginx/meta/sensu.yml b/nginx/meta/sensu.yml
index 421f4b3..9765584 100644
--- a/nginx/meta/sensu.yml
+++ b/nginx/meta/sensu.yml
@@ -7,7 +7,7 @@
     subscribers:
     - local-nginx-server
   local_nginx_server_worker_procs:
-    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u www-data -c 1:20"
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u {{ server.user }} -c 1:20"
     interval: 60
     occurrences: 1
     subscribers:
@@ -23,4 +23,4 @@
     - remote-network
   {%- endif %}
   {%- endif %}
-  {%- endfor %}
\ No newline at end of file
+  {%- endfor %}
diff --git a/nginx/server/sites.sls b/nginx/server/sites.sls
index dc0eb65..64ed8a6 100644
--- a/nginx/server/sites.sls
+++ b/nginx/server/sites.sls
@@ -62,7 +62,7 @@
 
 sites-available-{{ site_name }}:
   file.managed:
-  - name: /etc/nginx/sites-available/{{ site.type }}_{{ site.name }}.conf
+  - name: {{ server.vhost_dir }}/{{ site.type }}_{{ site.name }}.conf
   {%- if site.type == 'nginx_proxy' %}
   - source: salt://nginx/files/proxy.conf
   {%- elif site.type == 'nginx_redirect' %}
@@ -82,18 +82,22 @@
   - defaults:
     site_name: "{{ site_name }}"
 
+{%- if grains.os_family == 'Debian' %}
 sites-enabled-{{ site_name }}:
   file.symlink:
   - name: /etc/nginx/sites-enabled/{{ site.type }}_{{ site.name }}.conf
-  - target: /etc/nginx/sites-available/{{ site.type }}_{{ site.name }}.conf
+  - target: {{ server.vhost_dir }}/{{ site.type }}_{{ site.name }}.conf
+{%- endif %}
 
 {%- else %}
 
-/etc/nginx/sites-available/{{ site.type }}_{{ site.name }}.conf:
+{{ server.vhost_dir }}/{{ site.type }}_{{ site.name }}.conf:
   file.absent
 
+{%- if grains.os_family == 'Debian' %}
 /etc/nginx/sites-enabled/{{ site.type }}_{{ site.name }}.conf:
   file.absent
+{%- endif %}
 
 {%- endif %}
 {%- endfor %}