diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 37bd5fd..ec14da8 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -5,8 +5,3 @@ COPY nginx.conf /etc/nginx/nginx.conf
 COPY src/favicon.ico /usr/share/nginx/html/
 COPY src/index.htm /usr/share/nginx/html/
 COPY src/ttlsh_files /usr/share/nginx/html/ttlsh_files/
-
-ADD entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/nginx/entrypoint.sh b/nginx/entrypoint.sh
deleted file mode 100755
index 4616af1..0000000
--- a/nginx/entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-sed -i "s/__PORT__/$PORT/g" /etc/nginx/nginx.conf
-
-exec "$@"
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index c43fdd9..1cc68b6 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -3,9 +3,16 @@ http {
     include mime.types;
     default_type application/octet-stream;
 
+    proxy_ssl_server_name on;
+    resolver 8.8.8.8;
+
+    upstream upstream_ttlsh {
+        server ttlsh.herokuapp.com:443;
+    }
+
     server {
-        listen __PORT__;
-        server_name router.ttl.sh;
+        listen <%= ENV["PORT"] %>;
+        server_name _;
 
         location / {
             root /usr/share/nginx/html;
@@ -18,15 +25,13 @@ http {
 
         location /v2 {
             client_max_body_size    10000m;
-
-            proxy_pass              https://ttl.sh;
-            proxy_http_version      1.1;
-            proxy_request_buffering off;
-            proxy_intercept_errors  on;
-            proxy_set_header        Host $host;
+            set                     $upstream upstream_ttlsh;
+            proxy_pass              https://$upstream;
+            proxy_ssl_name          ttlsh.herokuapp.com;
+            proxy_set_header        x-forwarded-host $host;
             proxy_set_header        X-Real-IP $remote_addr;
-            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header        X-Forwarded-Proto $scheme;
+            proxy_set_header        Host ttlsh.herokuapp.com;
+            proxy_request_buffering off;
         }
     }
 }