diff --git a/Dockerfile b/Dockerfile
index 06d545e..397c36b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,15 +13,15 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 #fix for long server names
 RUN sed -i 's/# server_names_hash_bucket/server_names_hash_bucket/g' /etc/nginx/nginx.conf
 
-RUN mkdir /app
-WORKDIR /app
-ADD . /app
-
 RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego
 RUN chmod u+x /usr/local/bin/forego
 
 RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.2/docker-gen-linux-amd64-0.3.2.tar.gz
-RUN tar xvzf docker-gen-linux-amd64-0.3.2.tar.gz
+RUN tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-0.3.2.tar.gz
+
+RUN mkdir /app
+WORKDIR /app
+ADD . /app
 
 EXPOSE 80
 ENV DOCKER_HOST unix:///tmp/docker.sock
diff --git a/Procfile b/Procfile
index 191d01a..7a22293 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
 nginx: nginx
-dockergen: /app/docker-gen -watch -only-exposed -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/sites-enabled/default
+dockergen: docker-gen -watch -only-exposed -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/sites-enabled/default
diff --git a/nginx.tmpl b/nginx.tmpl
index 2f1eac4..701fa58 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -49,12 +49,12 @@ server {
 	access_log /proc/self/fd/1;
 
 	location / {
-		proxy_pass http://{{ $host }};
-		include /etc/nginx/proxy_params;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header Host $http_host;
+		proxy_redirect false;
 
-		# HTTP 1.1 support
-		proxy_http_version 1.1;
-		proxy_set_header Connection "";
+		proxy_pass http://{{ $host }};
 	}
 }
 {{ end }}