diff --git a/etc/nginx/conf.d/upstream.conf b/etc/nginx/conf.d/upstream.conf
index 4061517..a4033ea 100644
--- a/etc/nginx/conf.d/upstream.conf
+++ b/etc/nginx/conf.d/upstream.conf
@@ -13,6 +13,7 @@ server unix:/var/run/php/php72-two-fpm.sock;
 
 keepalive 5;
 }
+
 upstream debug {
 # Debug Pool
 server 127.0.0.1:9001;
@@ -36,40 +37,40 @@ keepalive 5;
 # php7.2-fpm
 ##################
 
-# TCP/IP on loopback interface
-upstream php72-tcp {
-server 127.0.0.1:9093;
-}
-
 # load-balancing on unix socket
 upstream php72 {
 least_conn;
 
-server unix:/var/run/php/php72-fpm.sock;
-server unix:/var/run/php/php72-two-fpm.sock;
+server unix:/var/run/php/php72-sock-fpm.sock;
+server unix:/var/run/php/php72-sock-two-fpm.sock;
 
 keepalive 5;
 }
 
+# PHP 7.2 debug
+upstream debug72 {
+# Debug Pool
+server 127.0.0.1:9172;
+}
+
 ##################
 # php7.3-fpm
 ##################
 
-# TCP/IP on loopback interface
-upstream php73-tcp {
-server 127.0.0.1:9093;
-}
-
 # load-balancing on unix socket
 upstream php73 {
 least_conn;
 
-server unix:/var/run/php/php73-fpm.sock;
-server unix:/var/run/php/php73-two-fpm.sock;
+server unix:/var/run/php/php73-sock-fpm.sock;
+server unix:/var/run/php/php73-sock-two-fpm.sock;
 
 keepalive 5;
 }
 
+upstream debug73 {
+# Debug Pool
+server 127.0.0.1:9173;
+}
 
 ##################
 # redis
diff --git a/etc/php/7.1/fpm/pool.d/www.conf b/etc/php/7.1/fpm/pool.d/www.conf
deleted file mode 100644
index 93d9317..0000000
--- a/etc/php/7.1/fpm/pool.d/www.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[www]
-user = www-data
-group = www-data
-listen = 127.0.0.1:9080
-listen.owner = www-data
-listen.group = www-data
-pm = ondemand
-pm.max_children = 100
-pm.start_servers = 20
-pm.min_spare_servers = 10
-pm.max_spare_servers = 30
-ping.path = /ping
-pm.status_path = /status
-pm.max_requests = 500
-request_terminate_timeout = 300
diff --git a/etc/php/7.2/fpm/pool.d/www-sock.conf b/etc/php/7.2/fpm/pool.d/www-sock.conf
index 53392bc..abda66d 100644
--- a/etc/php/7.2/fpm/pool.d/www-sock.conf
+++ b/etc/php/7.2/fpm/pool.d/www-sock.conf
@@ -3,7 +3,7 @@ user = www-data
 group = www-data
 prefix = /var/run/php
 
-listen = php72-fpm.sock
+listen = php72-sock-fpm.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0660
diff --git a/etc/php/7.2/fpm/pool.d/www-two-sock.conf b/etc/php/7.2/fpm/pool.d/www-two-sock.conf
index d7cc7b2..b97f890 100644
--- a/etc/php/7.2/fpm/pool.d/www-two-sock.conf
+++ b/etc/php/7.2/fpm/pool.d/www-two-sock.conf
@@ -3,7 +3,7 @@ user = www-data
 group = www-data
 prefix = /var/run/php
 
-listen = php72-two-fpm.sock
+listen = php72-sock-two-fpm.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0660
diff --git a/etc/php/7.2/fpm/pool.d/www.conf b/etc/php/7.2/fpm/pool.d/www.conf
deleted file mode 100644
index 975bad3..0000000
--- a/etc/php/7.2/fpm/pool.d/www.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[www]
-user = www-data
-group = www-data
-listen = 127.0.0.1:9090
-listen.owner = www-data
-listen.group = www-data
-pm = ondemand
-pm.max_children = 100
-pm.start_servers = 20
-pm.min_spare_servers = 10
-pm.max_spare_servers = 30
-ping.path = /ping
-pm.status_path = /status
-pm.max_requests = 500
-request_terminate_timeout = 300
diff --git a/etc/php/7.3/fpm/pool.d/www-sock.conf b/etc/php/7.3/fpm/pool.d/www-sock.conf
index 4ad1722..2c0a305 100644
--- a/etc/php/7.3/fpm/pool.d/www-sock.conf
+++ b/etc/php/7.3/fpm/pool.d/www-sock.conf
@@ -3,7 +3,7 @@ user = www-data
 group = www-data
 prefix = /var/run/php
 
-listen = php73-fpm.sock
+listen = php73-sock-fpm.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0660
diff --git a/etc/php/7.3/fpm/pool.d/www-two-sock.conf b/etc/php/7.3/fpm/pool.d/www-two-sock.conf
index d52c174..ead6643 100644
--- a/etc/php/7.3/fpm/pool.d/www-two-sock.conf
+++ b/etc/php/7.3/fpm/pool.d/www-two-sock.conf
@@ -3,7 +3,7 @@ user = www-data
 group = www-data
 prefix = /var/run/php
 
-listen = php73-two-fpm.sock
+listen = php73-sock-two-fpm.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0660
diff --git a/etc/php/7.3/fpm/pool.d/www.conf b/etc/php/7.3/fpm/pool.d/www.conf
deleted file mode 100644
index f8aab34..0000000
--- a/etc/php/7.3/fpm/pool.d/www.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[www]
-user = www-data
-group = www-data
-listen = 127.0.0.1:9093
-listen.owner = www-data
-listen.group = www-data
-pm = ondemand
-pm.max_children = 100
-pm.start_servers = 20
-pm.min_spare_servers = 10
-pm.max_spare_servers = 30
-ping.path = /ping
-pm.status_path = /status
-pm.max_requests = 500
-request_terminate_timeout = 300