diff --git a/roles/ipsilon/templates/configuration.conf b/roles/ipsilon/templates/configuration.conf
index 18818511fd..e754532713 100644
--- a/roles/ipsilon/templates/configuration.conf
+++ b/roles/ipsilon/templates/configuration.conf
@@ -74,6 +74,14 @@ saml2 session database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_stg_db_
 {% else %}
 saml2 session database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_saml2_name }}
 {% endif %}
+
+[saml2_data]
+{% if env == 'staging' %}
+{% include "saml2_data_stg" %}
+{% else %}
+{% include "saml2_data" %}
+{% endif %}
+
 {% endif %}
 {% else %}
 global enabled=saml2,openidc,openid
@@ -132,8 +140,6 @@ saml2 default email domain=fedoraproject.org
 saml2 session database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_stg_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_saml2_name }}
 {% else %}
 saml2 session database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_saml2_name }}
-{% endif %}
-{% endif %}
 
 [saml2_data]
 {% if env == 'staging' %}