diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 2be5955..000f925 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -41,7 +41,7 @@ services:
   # External database at "{{ outline_db_schema }}:{{ outline_db_host }}: {{ outline_db_port }}"
 {% endif %}
 
-{% if outline_fake_s3 %}
+{% if outline_fake_s3 and (outline_fake_s3 != "") %}
   s3:
     image: lphoward/fake-s3
     env_file:
@@ -61,15 +61,19 @@ services:
     command: sh -c "yarn start"
     # command: sh -c "yarn sequelize:migrate --env production-ssl-disabled && yarn start"
     env_file:
-      - ./env.outline.conf
-      - ./env.oidc.conf
-    #restart: never
+      - "{{ outline_setup_path }}/env.outline.conf"
+      - "{{ outline_setup_path }}/env.oidc.conf"
+    restart: always
     ports:
       - {{ outline_port }}:3000
     depends_on:
+{% if outline_db_schema == 'postgres' and outline_db_host == 'postgres' %}
       - postgres
+{% endif %}
       - redis
+{% if outline_fake_s3 and (outline_fake_s3 != "") %}
       - s3
+{% endif %}
     networks:
       - outline
 
diff --git a/templates/env.outline.conf.j2 b/templates/env.outline.conf.j2
index b983d0f..323d7ae 100644
--- a/templates/env.outline.conf.j2
+++ b/templates/env.outline.conf.j2
@@ -59,7 +59,7 @@ SENTRY_DSN=
 AWS_ACCESS_KEY_ID={{ outline_aws_access_key_id }}
 AWS_SECRET_ACCESS_KEY={{ outline_aws_secret_access_key }}
 AWS_REGION={{ outline_aws_region }}
-AWS_S3_UPLOAD_BUCKET_URL={ outline_aws_s3_upload_bucket_url}
+AWS_S3_UPLOAD_BUCKET_URL={{ outline_aws_s3_upload_bucket_url }}
 AWS_S3_UPLOAD_BUCKET_NAME={{ outline_aws_s3_upload_bucket_name }}
 AWS_S3_UPLOAD_MAX_SIZE={{ outline_aws_s3_upload_max_size }}
 AWS_S3_FORCE_PATH_STYLE={{ outline_aws_s3_force_path_style }}