diff --git a/builder.sh b/builder.sh
index 01debfd..08be293 100755
--- a/builder.sh
+++ b/builder.sh
@@ -53,5 +53,5 @@ else
 	       f_build_and_push $directory $FORCE_BUILD
        fi
     done
-    #git push --mirror git@github.com:Dryusdan/Dockerfiles.git
+    git push --mirror git@github.com:Dryusdan/Dockerfiles.git
 fi
diff --git a/reverse-nginx/rootfs/etc/s6.d/tor/run b/reverse-nginx/rootfs/etc/s6.d/tor/run
deleted file mode 100644
index a6585ac..0000000
--- a/reverse-nginx/rootfs/etc/s6.d/tor/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec tor
diff --git a/reverse-proxy/.Dockerfile.swp b/reverse-proxy/.Dockerfile.swp
new file mode 100644
index 0000000..8c2135d
Binary files /dev/null and b/reverse-proxy/.Dockerfile.swp differ
diff --git a/reverse-nginx/.drone.yml b/reverse-proxy/.drone.yml
similarity index 100%
rename from reverse-nginx/.drone.yml
rename to reverse-proxy/.drone.yml
diff --git a/reverse-nginx/Dockerfile b/reverse-proxy/Dockerfile
similarity index 99%
rename from reverse-nginx/Dockerfile
rename to reverse-proxy/Dockerfile
index de25ecf..a959a4f 100644
--- a/reverse-nginx/Dockerfile
+++ b/reverse-proxy/Dockerfile
@@ -98,7 +98,7 @@ RUN export BUILD_DEPS="build-base \
 COPY rootfs /
 RUN chmod +x /usr/local/bin/startup /etc/s6.d/*/*
 
-EXPOSE 8080 8443
+EXPOSE 80 443
 
 ENTRYPOINT ["/usr/local/bin/startup"]
 CMD ["/bin/s6-svscan", "/etc/s6.d"]
diff --git a/reverse-nginx/README.md b/reverse-proxy/README.md
similarity index 100%
rename from reverse-nginx/README.md
rename to reverse-proxy/README.md
diff --git a/reverse-nginx/auto_upgrade.sh b/reverse-proxy/auto_upgrade.sh
similarity index 100%
rename from reverse-nginx/auto_upgrade.sh
rename to reverse-proxy/auto_upgrade.sh
diff --git a/reverse-nginx/docker-compose.yml b/reverse-proxy/docker-compose.yml
similarity index 100%
rename from reverse-nginx/docker-compose.yml
rename to reverse-proxy/docker-compose.yml
diff --git a/reverse-nginx/rootfs/etc/s6.d/.s6-svscan/finish b/reverse-proxy/rootfs/etc/s6.d/.s6-svscan/finish
similarity index 100%
rename from reverse-nginx/rootfs/etc/s6.d/.s6-svscan/finish
rename to reverse-proxy/rootfs/etc/s6.d/.s6-svscan/finish
diff --git a/reverse-nginx/rootfs/etc/s6.d/check_certs/run b/reverse-proxy/rootfs/etc/s6.d/check_certs/run
similarity index 100%
rename from reverse-nginx/rootfs/etc/s6.d/check_certs/run
rename to reverse-proxy/rootfs/etc/s6.d/check_certs/run
diff --git a/reverse-nginx/rootfs/etc/s6.d/nginx/run b/reverse-proxy/rootfs/etc/s6.d/nginx/run
similarity index 100%
rename from reverse-nginx/rootfs/etc/s6.d/nginx/run
rename to reverse-proxy/rootfs/etc/s6.d/nginx/run
diff --git a/reverse-proxy/rootfs/etc/s6.d/tor/run b/reverse-proxy/rootfs/etc/s6.d/tor/run
new file mode 100644
index 0000000..cfc2fcb
--- /dev/null
+++ b/reverse-proxy/rootfs/etc/s6.d/tor/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+#exec tor -f /etc/tor/torrc
diff --git a/reverse-nginx/rootfs/etc/tor/torrc b/reverse-proxy/rootfs/etc/tor/torrc
similarity index 100%
rename from reverse-nginx/rootfs/etc/tor/torrc
rename to reverse-proxy/rootfs/etc/tor/torrc
diff --git a/reverse-nginx/rootfs/nginx/conf.d/headers.conf b/reverse-proxy/rootfs/nginx/conf.d/headers.conf
similarity index 100%
rename from reverse-nginx/rootfs/nginx/conf.d/headers.conf
rename to reverse-proxy/rootfs/nginx/conf.d/headers.conf
diff --git a/reverse-nginx/rootfs/nginx/conf.d/proxy.conf b/reverse-proxy/rootfs/nginx/conf.d/proxy.conf
similarity index 100%
rename from reverse-nginx/rootfs/nginx/conf.d/proxy.conf
rename to reverse-proxy/rootfs/nginx/conf.d/proxy.conf
diff --git a/reverse-nginx/rootfs/nginx/conf.d/ssl.conf b/reverse-proxy/rootfs/nginx/conf.d/ssl.conf
similarity index 100%
rename from reverse-nginx/rootfs/nginx/conf.d/ssl.conf
rename to reverse-proxy/rootfs/nginx/conf.d/ssl.conf
diff --git a/reverse-nginx/rootfs/nginx/conf/nginx.conf b/reverse-proxy/rootfs/nginx/conf/nginx.conf
similarity index 100%
rename from reverse-nginx/rootfs/nginx/conf/nginx.conf
rename to reverse-proxy/rootfs/nginx/conf/nginx.conf
diff --git a/reverse-nginx/rootfs/nginx/path.d/template b/reverse-proxy/rootfs/nginx/path.d/template
similarity index 100%
rename from reverse-nginx/rootfs/nginx/path.d/template
rename to reverse-proxy/rootfs/nginx/path.d/template
diff --git a/reverse-nginx/rootfs/nginx/path.d/template_auth b/reverse-proxy/rootfs/nginx/path.d/template_auth
similarity index 100%
rename from reverse-nginx/rootfs/nginx/path.d/template_auth
rename to reverse-proxy/rootfs/nginx/path.d/template_auth
diff --git a/reverse-nginx/rootfs/nginx/sites-enabled/template b/reverse-proxy/rootfs/nginx/sites-enabled/template
similarity index 89%
rename from reverse-nginx/rootfs/nginx/sites-enabled/template
rename to reverse-proxy/rootfs/nginx/sites-enabled/template
index d82fd18..9577f8b 100644
--- a/reverse-nginx/rootfs/nginx/sites-enabled/template
+++ b/reverse-proxy/rootfs/nginx/sites-enabled/template
@@ -1,6 +1,6 @@
 server {
-  listen 8080;
+  listen 80;
   server_name <frontend_domain>;
   include /nginx/conf.d/headers.conf;
   include /nginx/path.d/<frontend_domain>/*.conf;
-}
\ No newline at end of file
+}
diff --git a/reverse-nginx/rootfs/nginx/sites-enabled/template_ssl b/reverse-proxy/rootfs/nginx/sites-enabled/template_ssl
similarity index 81%
rename from reverse-nginx/rootfs/nginx/sites-enabled/template_ssl
rename to reverse-proxy/rootfs/nginx/sites-enabled/template_ssl
index 70a6fc5..5434f93 100644
--- a/reverse-nginx/rootfs/nginx/sites-enabled/template_ssl
+++ b/reverse-proxy/rootfs/nginx/sites-enabled/template_ssl
@@ -1,6 +1,6 @@
 server {
-  listen 8080;
-  server_name <frontend_domain>;
+  listen 80;
+  server_name <frontend_domain> <onion_domain>;
 
   rewrite ^ https://<frontend_domain>:443$request_uri? permanent;
 }
@@ -8,8 +8,8 @@ server {
 
 server {
 
-  listen 8443 ssl http2;
-  server_name <frontend_domain>;
+  listen 443 ssl http2;
+  server_name <frontend_domain> <onion_domain>;
   index index.html index.php index.htm;
 
   ssl_certificate /nginx/ssl/certificates/<frontend_domain>.crt;
diff --git a/reverse-nginx/rootfs/nginx/www/letsencrypt b/reverse-proxy/rootfs/nginx/www/letsencrypt
similarity index 100%
rename from reverse-nginx/rootfs/nginx/www/letsencrypt
rename to reverse-proxy/rootfs/nginx/www/letsencrypt
diff --git a/reverse-nginx/rootfs/usr/local/bin/check_certs b/reverse-proxy/rootfs/usr/local/bin/check_certs
similarity index 100%
rename from reverse-nginx/rootfs/usr/local/bin/check_certs
rename to reverse-proxy/rootfs/usr/local/bin/check_certs
diff --git a/reverse-nginx/rootfs/usr/local/bin/startup b/reverse-proxy/rootfs/usr/local/bin/startup
similarity index 85%
rename from reverse-nginx/rootfs/usr/local/bin/startup
rename to reverse-proxy/rootfs/usr/local/bin/startup
index 3fa819e..a444b7c 100644
--- a/reverse-nginx/rootfs/usr/local/bin/startup
+++ b/reverse-proxy/rootfs/usr/local/bin/startup
@@ -37,15 +37,20 @@ f_gen_sites_enabled() {
     fi
 	if [ "${FRONTEND_TOR}" == "true" ]; then
 		if [ -d /tor/${FRONTEND_DOMAIN}/ ]; then
-			sed -e 's|<frontend_domain>|'${FRONTEND_DOMAIN} $(`cat /tor/${FRONTEND_DOMAIN}/hostname`)'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf
+                        ONION_DOMAIN=$(cat /tor/${FRONTEND_DOMAIN}/hostname)
+                        echo "HiddenServiceDir /tor/"${FRONTEND_DOMAIN}"/" >> /etc/tor/torrc
+                        echo "HiddenServicePort 443 127.0.0.1:443" >> /etc/tor/torrc
+			sed -e 's|<frontend_domain>|'${FRONTEND_DOMAIN}'|' \
+                            -e 's|<onion_domain>|'${ONION_DOMAIN}'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf
 		else
-			echo "HiddenServiceDir /var/lib/tor/"${FRONTEND_DOMAIN}"/" >> /usr/local/etc/tor/torrc 
-			echo "HiddenServicePort 443 127.0.0.1:443" >> /usr/local/etc/tor/torrc 
-			sed -e 's|<frontend_domain>|'${FRONTEND_DOMAIN} $(`cat /tor/${FRONTEND_DOMAIN}/hostname`)'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf
-		fi
-        
+			echo "HiddenServiceDir /tor/"${FRONTEND_DOMAIN}"/" >> /etc/tor/torrc 
+			echo "HiddenServicePort 443 127.0.0.1:443" >> /etc/tor/torrc 
+                        echo "Please restard your container"
+			sed -e 's|<frontend_domain>|'${FRONTEND_DOMAIN}'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf
+                fi     
     else
-        sed -e 's|<frontend_domain>|'${FRONTEND_DOMAIN}'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf
+        sed -e 's|<frontend_domain>|'${FRONTEND_DOMAIN}'|' \
+            -e 's|<onion_domain>| |' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf
     fi
 }
 
@@ -171,8 +176,7 @@ f_log INF "Create user 'reverse'"
 addgroup -g ${GID} reverse && adduser -H -s /bin/sh -D -G reverse -u ${UID} reverse
 f_log INF "Create folder"
 mkdir -p /nginx/sites-enabled /nginx /nginx/log /nginx/run /nginx/sites-enabled /nginx/ssl /nginx/ssl/selfsigned/dhparam
-
-
+mkdir -p /home/reverse/.tor
 # Generate file
 for container in $(curl --unix-socket /var/run/docker.sock http://localhost/containers/json 2> /dev/null | jq '.[].Names' | sed 's|.*"/\(.*\)"$|\1|;/\[/d;/\]/d'); do 
     CONTAINER_LABELS=$(curl --unix-socket /var/run/docker.sock http://localhost/containers/${container}/json 2> /dev/null | jq '.Config.Labels' | grep -E "reverse\." | sed 's|.*"\(.*\)": "\(.*\)".*$|\1 \2|')
@@ -180,7 +184,7 @@ for container in $(curl --unix-socket /var/run/docker.sock http://localhost/cont
 done
 
 f_log INF "Apply permissions"
-chown -R reverse:reverse /nginx /etc/s6.d
+chown -R reverse:reverse /nginx /etc/s6.d /tor/ /home/reverse/.tor
 chmod +x /usr/local/bin/check_certs
 find /etc/s6.d -name run -exec chmod +x {} \;
 find /etc/s6.d -name finish -exec chmod +x {} \;
@@ -190,8 +194,8 @@ f_log SUC "End reverse configuration"
 
 ## run s6
 if [ $# -gt 0 ]; then
-    exec su-exec reverse:reverse "$@" 
+    exec su-exec reverse:reverse "$@"
 else
-    exec su-exec reverse:reverse /bin/s6-svscan /etc/s6.d  
-    exec su-exec tor:tor /bin/s6-svscan /etc/s6-tor.d    
+    exec su-exec reverse:reverse /bin/s6-svscan /etc/s6.d      
 fi
+