diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml
index 7d48c99..09a244b 100644
--- a/roles/forgejo/defaults/main.yml
+++ b/roles/forgejo/defaults/main.yml
@@ -32,3 +32,12 @@ forgejo_use_ci: false
 # forgejo_ci_gitea_url:
 # forgejo_ci_gitea_client:
 # forgejo_ci_gitea_secret:
+
+forgejo_use_s3: false
+forgejo_s3_use_ssl: true
+forgejo_s3_bucket_lookup: auto # auto|dns|path
+# forgejo_s3_endpoint:
+# forgejo_s3_region:
+# forgejo_s3_key:
+# forgejo_s3_secret:
+# forgejo_s3_bucket:
diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2
index 4448c3b..5bad7af 100644
--- a/roles/forgejo/templates/docker-stack.yml.j2
+++ b/roles/forgejo/templates/docker-stack.yml.j2
@@ -24,7 +24,7 @@ services:
       - "FORGEJO__database__PASSWD={{ forgejo_db_password }}"
       - "FORGEJO__server__ROOT_URL={{ (forgejo_use_https == True) | ternary('https', 'http') }}://{{ (subdomain_alias is not undefined and not none) | ternary(subdomain_alias, stack_name) }}.{{server_domain}}"
       - "FORGEJO__server__SSH_DOMAIN={{ (subdomain_alias is not undefined and not none) | ternary(subdomain_alias, stack_name) }}.{{server_domain}}"
-      - FORGEJO__server__LANDINGPAGE=explore
+      - FORGEJO__server__LANDING_PAGE=explore
       - FORGEJO__service__DISABLE_REGISTRATION=true
 {% if forgejo_app_admin_username is not undefined and not None and forgejo_app_admin_password is not undefined and not None %}
       - FORGEJO__security__INSTALL_LOCK=true
@@ -38,6 +38,16 @@ services:
       - FORGEJO__mailer__IS_TLS_ENABLED={{ (forgejo_smtp_force_tls is not undefined and not None) | ternary(forgejo_smtp_force_tls,'false') }}
       - FORGEJO__mailer__USER={{ forgejo_smtp_username }}
       - FORGEJO__mailer__PASSWD={{ forgejo_smtp_password }}
+{% endif %}
+{% if forgejo_use_s3 %}
+      - FORGEJO__storage__STORAGE_TYPE="minio"
+      - FORGEJO__storage__MINIO_USE_SSL={{ forgejo_s3_use_ssl }}
+      - FORGEJO__storage__MINIO_BUCKET_LOOKUP={{ forgejo_s3_bucket_lookup }}
+      - FORGEJO__storage__MINIO_ENDPOINT={{ forgejo_s3_endpoint }}
+      - FORGEJO__storage__MINIO_ACCESS_KEY_ID={{ forgejo_s3_key }}
+      - FORGEJO__storage__MINIO_SECRET_ACCESS_KEY={{ forgejo_s3_secret }}
+      - FORGEJO__storage__MINIO_BUCKET={{ forgejo_s3_bucket }}
+      - FORGEJO__storage__MINIO_LOCATION={{ forgejo_s3_region }}
 {% endif %}
     networks:
       - "{{ docker_swarm_public_network_name }}"