diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
index 150e1b6..8a33d8e 100755
--- a/.s2i/bin/assemble
+++ b/.s2i/bin/assemble
@@ -7,7 +7,8 @@ set -e
 cd /tmp/src
 
 echo "Install nginx configuration files..."
-cp conf.d/sso-proxy.conf $NGINX_CONFIGURATION_PATH/
+cp nginx.d/*.conf $NGINX_CONFIGURATION_PATH/
+cp nginx.conf $APP_ROOT/etc/
 
 echo "Creating empty dirs to hold serving certs and trusted CAs..."
 mkdir -p $APP_ROOT/etc/serving-cert/ $APP_ROOT/etc/ca-certs/
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..5c7bd83
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,17 @@
+worker_processes  1;
+env $LOG_LEVEL;
+error_log /dev/stdout $LOG_LEVEL;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  text/plain;
+    sendfile        on;
+    keepalive_timeout  65;
+}
+
+include nginx.d/*.conf;
+
diff --git a/conf.d/sso-proxy.conf b/nginx.d/sso-proxy.conf
similarity index 100%
rename from conf.d/sso-proxy.conf
rename to nginx.d/sso-proxy.conf