diff --git a/default.conf b/default.conf
index a02eed79a99f92cb1c403d860a113f545ed70a8a..8ac9d3ca9a6bdb0eaae3680376b9e498c02ff689 100644
--- a/default.conf
+++ b/default.conf
@@ -1,3 +1,8 @@
+map $http_x_forwarded_proto $redirect_scheme {
+    default $scheme;
+    https https;
+}
+
 server {
     listen       80;
     server_name  ${SERVER_NAME};
diff --git a/run.sh b/run.sh
index 9bc62dd72e2b7fad059fa8e027ea04843fbc01fe..844316c588be821afe00729714111ac8f2392bbf 100644
--- a/run.sh
+++ b/run.sh
@@ -24,7 +24,7 @@ fi
 
 # set redirect scheme from optional ENV var
 if [ ! -n "$SERVER_REDIRECT_SCHEME" ] ; then
-    SERVER_REDIRECT_SCHEME='$scheme'
+    SERVER_REDIRECT_SCHEME='$redirect_scheme'
 fi
 
 # set access log location from optional ENV var