diff --git a/roles/penpot/templates/docker-compose.yml b/roles/penpot/templates/docker-compose.yml
index 9d62d9b..71fe3bd 100644
--- a/roles/penpot/templates/docker-compose.yml
+++ b/roles/penpot/templates/docker-compose.yml
@@ -83,6 +83,7 @@ services:
       - PENPOT_GITLAB_CLIENT_ID={{ penpot_gitlab.client_id }}
       - PENPOT_GITLAB_CLIENT_SECRET={{ penpot_gitlab.client_secret }}
 {% endif %}
+
       # Standard database connection parametes (only postgresql is supported):
       - PENPOT_DATABASE_URI=postgresql://penpot-postgres/penpot
       - PENPOT_DATABASE_USERNAME=penpot
@@ -96,8 +97,8 @@ services:
       # completelly in de the database. Storing in the database makes
       # the backups more easy but will make access to media less
       # performant.
-      - PENPOT_STORAGE_BACKEND=fs
-      - PENPOT_STORAGE_FS_DIRECTORY=/opt/data/assets
+      - ASSETS_STORAGE_BACKEND=assets-fs
+      - PENPOT_STORAGE_ASSETS_FS_DIRECTORY=/opt/data/assets
 
       # Telemetry. When enabled, a periodical process will send
       # annonymous data about this instance. Telemetry data will
@@ -118,8 +119,8 @@ services:
       - PENPOT_SMTP_PORT={{ penpot_smtp.port }}
       - PENPOT_SMTP_USERNAME={{ penpot_smtp.username }}
       - PENPOT_SMTP_PASSWORD={{ penpot_smtp.password }}
-      - PENPOT_SMTP_TLS={{ penpot_smtp.tls | lower }}
-      - PENPOT_SMTP_SSL={{ penpot_smtp.ssl | lower }}
+      - PENPOT_SMTP_TLS={{ penpot_smtp.tls | bool | lower }}
+      - PENPOT_SMTP_SSL={{ penpot_smtp.ssl | bool | lower }}
 {% endif %}
     networks:
       - penpot