diff --git a/roles/app/tasks/docker.yml b/roles/app/tasks/docker.yml
index fd33218..548952d 100644
--- a/roles/app/tasks/docker.yml
+++ b/roles/app/tasks/docker.yml
@@ -129,12 +129,8 @@
       SAML_EMAIL_ATTR_NAME: "{{ saml_email_attr_name }}"
       SAML_FIRSTNAME_ATTR_NAME: "{{ saml_firstname_attr_name }}"
       SAML_LASTNAME_ATTR_NAME: "{{ saml_lastname_attr_name }}"
-      {% if saml_metadata_url %}
       SAML_METADATA_URL: "{{ saml_metadata_url }}"
-      {% endif %}
-      {% if saml_metadata_content %}
       SAML_METADATA_CONTENT: "{{ saml_metadata_content }}"
-      {% endif %}
       SAML_SIGN_REQUESTS: "{{ saml_sign_requests }}"
       SAML_SIGN_METADATA: "{{ saml_sign_metadata }}"
       SAML_SIGNED_ASSERTION: "{{ saml_signed_assertion }}"
diff --git a/roles/app/templates/trento-web.j2 b/roles/app/templates/trento-web.j2
index bd290b9..cba3e55 100644
--- a/roles/app/templates/trento-web.j2
+++ b/roles/app/templates/trento-web.j2
@@ -45,12 +45,8 @@ SAML_USERNAME_ATTR_NAME: "{{ saml_username_attr_name }}"
 SAML_EMAIL_ATTR_NAME: "{{ saml_email_attr_name }}"
 SAML_FIRSTNAME_ATTR_NAME: "{{ saml_firstname_attr_name }}"
 SAML_LASTNAME_ATTR_NAME: "{{ saml_lastname_attr_name }}"
-{% if saml_metadata_url %}
 SAML_METADATA_URL: "{{ saml_metadata_url }}"
-{% endif %}
-{% if saml_metadata_content %}
 SAML_METADATA_CONTENT: "{{ saml_metadata_content }}"
-{% endif %}
 SAML_SIGN_REQUESTS: "{{ saml_sign_requests }}"
 SAML_SIGN_METADATA: "{{ saml_sign_metadata }}"
 SAML_SIGNED_ASSERTION: "{{ saml_signed_assertion }}"