diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch
index 991f6d8..cea6d73 100644
--- a/Dockerfile.multiarch
+++ b/Dockerfile.multiarch
@@ -35,9 +35,7 @@ RUN addgroup -g 1001 -S nginx && \
 ADD overlay/ /
 
 RUN mkdir -p /var/www /etc/nginx-s3 /etc/nginx/conf.d /var/tmp/nginx /var/cache/nginx && \
-    touch /run/nginx.pid && \
     touch /etc/nginx/conf.d/vhosts.conf && \
-    chown nginx /run/nginx.pid && \
     chown -R nginx /var/tmp/nginx /var/cache/nginx && \
     chown -R nginx:nginx /var/www && \
     chown -R root:nginx /etc/nginx /etc/nginx/conf.d && \
diff --git a/overlay/etc/nginx/nginx.conf b/overlay/etc/nginx/nginx.conf
index 917886e..2a86e31 100644
--- a/overlay/etc/nginx/nginx.conf
+++ b/overlay/etc/nginx/nginx.conf
@@ -1,5 +1,5 @@
 worker_processes 1;
-pid /var/run/nginx.pid;
+pid /var/tmp/nginx/nginx.pid;
 error_log stderr error;
 
 events {
diff --git a/overlay/etc/templates/vhosts.conf.tmpl b/overlay/etc/templates/vhosts.conf.tmpl
index bbff858..de3c7dd 100644
--- a/overlay/etc/templates/vhosts.conf.tmpl
+++ b/overlay/etc/templates/vhosts.conf.tmpl
@@ -50,13 +50,15 @@ server {
 
         {{ end -}}
 
-        proxy_pass https://backend_s3_{{ $this.bucket }}/{{ $this.bucket }}/${repo}$uri;
         {{- if $this.upstream_use_tls }}
+        proxy_pass https://backend_s3_{{ $this.bucket }}/{{ $this.bucket }}/${repo}$uri;
         proxy_ssl_name {{ $upstream_host }};
         proxy_ssl_server_name on;
         proxy_ssl_verify on;
         proxy_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
         proxy_ssl_protocols {{ $this.proxy_ssl_protocols }};
+        {{- else }}
+        proxy_pass http://backend_s3_{{ $this.bucket }}/{{ $this.bucket }}/${repo}$uri;
         {{- end }}
 
         proxy_http_version 1.1;