diff --git a/roles/metabase/templates/env.j2 b/roles/metabase/templates/env.j2
index 8c3b97a..b4f49f0 100644
--- a/roles/metabase/templates/env.j2
+++ b/roles/metabase/templates/env.j2
@@ -18,9 +18,17 @@ MB_ENCRYPTION_SECRET_KEY={{ metabase_encryption_key | quote }}
 MB_JETTY_HOST=0.0.0.0
 MB_JETTY_PORT={{ metabase_port }}
 MB_PLUGINS_DIR={{ metabase_root_dir }}/plugins
+{% if metabase_lock_lang is defined and metabase_lock_lang is sameas true %}
 MB_SITE_LOCALE={{ metabase_lang }}
+{% endif %}
 MB_SITE_URL={{ metabase_public_url }}
 MB_CHECK_FOR_UPDATES=false
-MB_ENABLE_EMBEDDING=true
-MB_ENABLE_PUBLIC_SHARING=true
+{% if metabase_enable_embedding is defined %}
+MB_ENABLE_EMBEDDING={{ metabase_enable_embedding | ternary('true', 'false') }}
+{% endif %}
+{% if metabase_enable_public_sharing is defined %}
+MB_ENABLE_PUBLIC_SHARING={{ metabase_enable_public_sharing | ternary('true', 'false') }}
+{% endif %}
+{% if metabase_smtp_user is defined and metabase_smtp_pass is defined %}
 MB_ENABLE_QUERY_CACHING={{ metabase_enable_cache | ternary('true', 'false') }}
+{% endif %}