diff --git a/Dockerfile b/Dockerfile
index 8179d97..f6144c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,17 @@
 FROM nginx:1.9.0
 MAINTAINER Jason Wilder jwilder@litl.com
 
+# Set timezone
+# The city selections might seem arbitrary, but they incorporate daylight savings
+# time automatically based on time zone and are better then manually picking
+# using the 'Etc/GMT+0' files.
+ENV             DEBIAN_FRONTEND noninteractive
+ENV             TIMEZONE America/Argentina/Buenos_Aires
+RUN             echo $TIMEZONE > /etc/timezone &&\
+                cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime &&\
+                dpkg-reconfigure tzdata
+RUN             env --unset=DEBIAN_FRONTEND
+
 # Install wget and install/updates certificates
 RUN apt-get update \
  && apt-get install -y -q --no-install-recommends \
diff --git a/nginx.tmpl b/nginx.tmpl
index 8df7dc7..3ee5b25 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -113,8 +113,8 @@ server {
 	{{ end }}
 
 	location / {
-		proxy_pass {{ $proto }}://{{ $host }};
-		proxy_redirect  {{ $proto }}://{{ $host }}/ /;
+		proxy_pass http://{{ $host }};
+		proxy_redirect http://{{ $host }}/ /;
 		proxy_read_timeout 60s;
 
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}