diff --git a/nginx-staging.conf b/nginx-staging.conf
new file mode 100644
index 000000000..68e88b274
--- /dev/null
+++ b/nginx-staging.conf
@@ -0,0 +1,78 @@
+worker_processes 1;
+
+user root nogroup;
+pid /tmp/nginx.pid;
+error_log /tmp/nginx.error.log;
+
+events {
+    worker_connections 1024;
+    accept_mutex off;
+}
+
+http {
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+
+    default_type application/octet-stream;
+    access_log /tmp/nginx.access.log combined;
+    sendfile on;
+
+    root /root/quay/;
+    
+    gzip on;
+    gzip_http_version 1.0;
+    gzip_proxied any;
+    gzip_min_length 500;
+    gzip_disable "MSIE [1-6]\.";
+    gzip_types text/plain text/xml text/css
+               text/javascript application/x-javascript
+               application/octet-stream;
+
+    upstream app_server {
+        server unix:/tmp/gunicorn.sock fail_timeout=0;
+        # For a TCP configuration:
+        # server 192.168.0.7:8000 fail_timeout=0;
+    }
+
+    server {
+        listen 80 default_server;
+        server_name _;
+        rewrite ^ https://$host$request_uri? permanent;
+    }
+
+    server {
+        listen 443 default;
+        client_max_body_size 8G;
+        server_name _;
+
+        keepalive_timeout 5;
+
+        ssl on;
+        ssl_certificate ./certs/quay-staging-unified.cert;
+        ssl_certificate_key ./certs/quay-staging.key;
+        ssl_session_timeout 5m;
+        ssl_protocols SSLv3 TLSv1;
+        ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+        ssl_prefer_server_ciphers on;
+
+        if ($args ~ "_escaped_fragment_") {
+            rewrite ^ /snapshot$uri;
+        }
+
+        location /static/ {
+            # checks for static file, if not found proxy to app
+            alias /root/quay/static/;
+        }
+
+        location / {
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Host $http_host;
+            proxy_redirect off;
+            proxy_buffering off;
+
+            proxy_pass   http://app_server;
+            proxy_read_timeout 2000;
+        }
+    }
+}
diff --git a/nginx.conf b/nginx.conf
index 68e88b274..536e09303 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,6 +1,6 @@
 worker_processes 1;
 
-user root nogroup;
+user nobody nogroup;
 pid /tmp/nginx.pid;
 error_log /tmp/nginx.error.log;
 
@@ -17,8 +17,6 @@ http {
     access_log /tmp/nginx.access.log combined;
     sendfile on;
 
-    root /root/quay/;
-    
     gzip on;
     gzip_http_version 1.0;
     gzip_proxied any;
@@ -48,8 +46,8 @@ http {
         keepalive_timeout 5;
 
         ssl on;
-        ssl_certificate ./certs/quay-staging-unified.cert;
-        ssl_certificate_key ./certs/quay-staging.key;
+        ssl_certificate ./certs/quay-unified.cert;
+        ssl_certificate_key ./certs/quay.key;
         ssl_session_timeout 5m;
         ssl_protocols SSLv3 TLSv1;
         ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
@@ -61,7 +59,7 @@ http {
 
         location /static/ {
             # checks for static file, if not found proxy to app
-            alias /root/quay/static/;
+            alias /home/ubuntu/quay/static/;
         }
 
         location / {
@@ -75,4 +73,4 @@ http {
             proxy_read_timeout 2000;
         }
     }
-}
+}
\ No newline at end of file