diff --git a/8.5-edge.Dockerfile b/8.5-edge.Dockerfile
index 3e05c78..aa65c43 100644
--- a/8.5-edge.Dockerfile
+++ b/8.5-edge.Dockerfile
@@ -42,7 +42,7 @@ RUN wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download
     esac; \
     rm -rf /tmp/*;
 
-COPY files/general files/php85 /
+COPY files/nginx files/php85 /
 
 WORKDIR /www
 
diff --git a/files/nginx/etc/nginx/nginx.conf b/files/nginx/etc/nginx/nginx.conf
new file mode 100644
index 0000000..e2ce287
--- /dev/null
+++ b/files/nginx/etc/nginx/nginx.conf
@@ -0,0 +1,65 @@
+user nginx;
+worker_processes auto;
+pcre_jit on;
+pid /var/run/nginx.pid;
+daemon off;
+
+events {
+	worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    server_tokens off;
+    client_max_body_size 1m;
+    keepalive_timeout 65;
+    sendfile on;
+    tcp_nodelay on;
+    gzip on;
+    gzip_vary on;
+    gzip_static on;
+
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+        '$status $body_bytes_sent "$http_referer" '
+        '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log /dev/stdout main;
+    error_log /dev/stdout warn;
+
+    real_ip_header X-Forwarded-For;
+    set_real_ip_from 10.0.0.0/8;
+    set_real_ip_from 172.16.0.0/12;
+    set_real_ip_from 192.168.0.0/16;
+
+    server {
+        listen 80 default_server;
+        root /www/public;
+        index index.php index.html;
+
+        location / {
+            try_files $uri $uri/ /index.php$is_args$args;
+        }
+
+        location ~ \.php$ {
+            fastcgi_pass 127.0.0.1:9000;
+            include fastcgi.conf;
+        }
+
+        location ~ ^/php-fpm-ping$ {
+            access_log off;
+            allow 127.0.0.1;
+            deny all;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_pass 127.0.0.1:9000;
+        }
+
+        location ~ ^/favicon.ico$ {
+            access_log off;
+        }
+    }
+}
+
+# Include other configuration files
+include /etc/nginx/http.d/*.conf;
diff --git a/files/php85/etc/services.d/php-fpm85/finish b/files/nginx/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/base
old mode 100755
new mode 100644
similarity index 100%
rename from files/php85/etc/services.d/php-fpm85/finish
rename to files/nginx/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/base
diff --git a/files/nginx/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm b/files/nginx/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm
new file mode 100644
index 0000000..e69de29
diff --git a/files/nginx/etc/s6-overlay/s6-rc.d/nginx/finish b/files/nginx/etc/s6-overlay/s6-rc.d/nginx/finish
new file mode 100755
index 0000000..e69de29
diff --git a/files/nginx/etc/s6-overlay/s6-rc.d/nginx/run b/files/nginx/etc/s6-overlay/s6-rc.d/nginx/run
new file mode 100755
index 0000000..8f7feb5
--- /dev/null
+++ b/files/nginx/etc/s6-overlay/s6-rc.d/nginx/run
@@ -0,0 +1,2 @@
+#!/usr/bin/with-contenv sh
+exec nginx
diff --git a/files/php85/etc/services.d/php-fpm85/type b/files/nginx/etc/s6-overlay/s6-rc.d/nginx/type
similarity index 100%
rename from files/php85/etc/services.d/php-fpm85/type
rename to files/nginx/etc/s6-overlay/s6-rc.d/nginx/type
diff --git a/files/nginx/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/files/nginx/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
new file mode 100644
index 0000000..e69de29
diff --git a/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/dependencies.d/base b/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/finish b/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/finish
new file mode 100755
index 0000000..e69de29
diff --git a/files/php85/etc/services.d/php-fpm85/run b/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/run
similarity index 100%
rename from files/php85/etc/services.d/php-fpm85/run
rename to files/php85/etc/s6-overlay/s6-rc.d/php-fpm/run
diff --git a/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/type b/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/files/php85/etc/s6-overlay/s6-rc.d/php-fpm/type
@@ -0,0 +1 @@
+longrun
diff --git a/files/php85/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm b/files/php85/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm
new file mode 100644
index 0000000..e69de29