diff --git a/roles/ipsilon/templates/configuration.conf b/roles/ipsilon/templates/configuration.conf
index 3b23316e8a..43e4dc8862 100644
--- a/roles/ipsilon/templates/configuration.conf
+++ b/roles/ipsilon/templates/configuration.conf
@@ -58,5 +58,4 @@ saml2 session database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass
 {% include "saml2_data_stg" %}
 {% else %}
 {% include "saml2_data" %}
-{% include "{{ private }}/files/saml2/production/metadata/private_saml2_data" %}
 {% endif %}
diff --git a/roles/ipsilon/templates/saml2_data b/roles/ipsilon/templates/saml2_data
index d41d2255b4..713ea1c0aa 100644
--- a/roles/ipsilon/templates/saml2_data
+++ b/roles/ipsilon/templates/saml2_data
@@ -8,3 +8,9 @@ beaker id = https://beaker.qa.fedoraproject.org/saml2
 beaker type = SP
 beaker name = Beaker
 beaker metadata = <?xml version='1.0' encoding='UTF-8'?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" cacheDuration="P7D" entityID="https://beaker.qa.fedoraproject.org/saml2"><md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAIJYzzIqyTO3MA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNVBAMMG2JlYWtlci5xYS5mZWRvcmFwcm9qZWN0Lm9yZzAeFw0xNjA0MDcxNTI4MDNaFw0yMTA0MDYxNTI4MDNaMCYxJDAiBgNVBAMMG2JlYWtlci5xYS5mZWRvcmFwcm9qZWN0Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0EiJo2tuXPT7TMPRHvsJ2Rt0RmcEIlYUAUsyDyJd14zrxpX6XNh5k11MNR/K3gtylpMsXnryGRZxV9QEERVD+eOrHWYgKBW+XxUkWvU3+5g6MJrnBK/4MahEOTCuj5dt06hABMgrip3i5wm/NCa8tu98IB3mP6ApX35nGG7zNgy+pycolzo00Nss1FW/wygZukAG+DDrGzQUHKx5dGIq3VTd6X/0jnTDh83gmM2IItYorKr6ZgG+Wzjtjr+eAVJbKaOuL895Wv1D7vpHpnac2pKxKB5Pd81tSDf++tInBKSSN7rb+0+YkV/aHa5zm2XqMZ8YOu8hX067TXZLmzYIkCAwEAAaNQME4wHQYDVR0OBBYEFHwukZpuQ6Y0qoK22fyVSvUzRK9GMB8GA1UdIwQYMBaAFHwukZpuQ6Y0qoK22fyVSvUzRK9GMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHzMR0NYdK/B2MzDk2nw056/ijebeVfOpawdFbkV5srXnlexUwZFroC90I5dkd9nPz3mT9A35DTv43j86UgK60RJhJhkoMRQC+nU2YBMSmxKl2OzsjNY4w0FW3DJhxfahGAy4whvhJYmQuAGdrvh657GPxfOP1OwUcIT4nconFr/QRVWvuYE6RsJoBE60eIka1G5mJxz5IlnBqG13Zx/C71a969E2StXVBOIx0cEgr8IZUw+rCFiM3Pv1ihTqagzydNtQM1OdUIcYYH1nfnm5sbBTaJ9VXrS+xs2lBOgZ8kuhm+XT1TOvIwyCRxf1vH6cnSmsOHMXnWfZN1YwI9uCS0=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beaker.qa.fedoraproject.org/saml2/logout"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beaker.qa.fedoraproject.org/saml2/logout"/><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beaker.qa.fedoraproject.org/saml2/postResponse" index="0" isDefault="true"/><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beaker.qa.fedoraproject.org/saml2/paosResponse" index="1"/><md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat></md:SPSSODescriptor></md:EntityDescriptor>
+
+
+bzqe id = https://bz-web.host.qe.eng.pek2.redhat.com/saml2_metadata.cgi
+bzqe type = SP
+bzqe name = Bugzilla QE
+bzqe metadata = <?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bz-web.host.qe.eng.pek2.redhat.com/saml2_metadata.cgi" validUntil="2016-09-27T23:42:32Z"> <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <md:KeyDescriptor use="encryption"> <ds:KeyInfo> <ds:X509Data>  <ds:X509Certificate>MIIFPzCCBCegAwIBAgIED/8BgzANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTYwNjIyMDIyMzE4WhcNMTgwNjIyMDIyMzE4WjCBvzELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMSswKQYDVQQDDCJiei13ZWIuaG9zdC5xZS5lbmcucGVrMi5yZWRoYXQuY29tMSswKQYJKoZIhvcNAQkBFhxwbnQtZGV2b3BzLXN5c29wc0ByZWRoYXQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvWTuPdQFm+bSS6mGM9RxFOZGNo/QPXk1YJZxc6f1GteoJTPRh3el4J3nlUT4yytJPnzavK4+VtaQjcuulGwc1l1KQ1Mwj8RfxpBSNSEXG+1HFn41e0Q+wYBLO1ai47ADqNMh6pCYgPNJPJrVQKNqNjHGO/UGl8UtAbU9P+sD3h3KudehGOPpcFvK9HodLwd/Ltf5HPLjz5wwyiWWBuVWuAuBcJtgh6uK6zeUyAPtqU6kaDJgmZHOt0fzvqpqlvGPqKKiPrjaRWrCtYiQyuAiejsMLTUmtvu/e6J7yspbojC+LY+EWJ5zeZQDF8qed60qeiXgGDCWLsNcVi9dyM3sNHzvwBK5AdSJA0dMKnsO/NjDHScGOhZO/EhslC5HLeBeGGpBk0Nz+/gILHtG1Sc79unlZGkkfUegxmGHMvADVqQp7cbTCotV1zI0EzHDfu+i3DH6lU+l+PSz/nWTgz1mPBdGaq3vBuO+LPgOI074J68kDDQnrSIhoy+WoCEv73pW7e9+EDNvled3Tu+Dv3a9bwkG1GWY4BUlb7k3uchFKFmJWrGSh6SGL+V9/1i6ndAYuMnKyITq9S37ExIGjN2VYZ27d7zqPz5ah0EP89jbm//+E4mxmqoZ+hYP9/wT2Qm2sDH0V7IwlajuJoUTIjJjzNsitC9hDOVj0sqEINr46dUCAwEAAaOBvzCBvDAfBgNVHSMEGDAWgBR72gn1SV3Z11zJNvhV0huXnhEvfjA7BggrBgEFBQcBAQQvMC0wKwYIKwYBBQUHMAGGH2h0dHA6Ly9vY3NwLnJlZGhhdC5jb20vY2Evb2NzcC8wDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAtBgNVHREEJjAkgiJiei13ZWIuaG9zdC5xZS5lbmcucGVrMi5yZWRoYXQuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCF3eC5l2bX/7wXHr54gxp1E0cm+HLQ60X/BSQNHHRft7J8pswmYJ0QTz0/GkFPnpvruVf/QTZKT+xfXnfrIFlqdPVhD1Yt3ZRqBzvSYFREqEN5j9l44pHfPFd3cwQsnl9P4FrDWD2W9fcwS9uyJPc2oOtBNQCpyDTZz+X+m40c5cYZ3lHTsEaA65xHt6VWeRcfzIVs+2n6O9d9Pd34WtwjJLkrFuNUJEVvugTOnAq1+oJVNczgn0KFpWEGO+ATcd4BCc+b8S9/obxOChVzZsq826uyj1/eEaMMDlCC7ugo0RPnsJQcVzmZeuaLmj6xQep/p2+G0qCYauRCT8TtSUrr</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> <md:KeyDescriptor use="signing"> <ds:KeyInfo> <ds:X509Data>  <ds:X509Certificate>MIIFPzCCBCegAwIBAgIED/8BgzANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTYwNjIyMDIyMzE4WhcNMTgwNjIyMDIyMzE4WjCBvzELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMSswKQYDVQQDDCJiei13ZWIuaG9zdC5xZS5lbmcucGVrMi5yZWRoYXQuY29tMSswKQYJKoZIhvcNAQkBFhxwbnQtZGV2b3BzLXN5c29wc0ByZWRoYXQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvWTuPdQFm+bSS6mGM9RxFOZGNo/QPXk1YJZxc6f1GteoJTPRh3el4J3nlUT4yytJPnzavK4+VtaQjcuulGwc1l1KQ1Mwj8RfxpBSNSEXG+1HFn41e0Q+wYBLO1ai47ADqNMh6pCYgPNJPJrVQKNqNjHGO/UGl8UtAbU9P+sD3h3KudehGOPpcFvK9HodLwd/Ltf5HPLjz5wwyiWWBuVWuAuBcJtgh6uK6zeUyAPtqU6kaDJgmZHOt0fzvqpqlvGPqKKiPrjaRWrCtYiQyuAiejsMLTUmtvu/e6J7yspbojC+LY+EWJ5zeZQDF8qed60qeiXgGDCWLsNcVi9dyM3sNHzvwBK5AdSJA0dMKnsO/NjDHScGOhZO/EhslC5HLeBeGGpBk0Nz+/gILHtG1Sc79unlZGkkfUegxmGHMvADVqQp7cbTCotV1zI0EzHDfu+i3DH6lU+l+PSz/nWTgz1mPBdGaq3vBuO+LPgOI074J68kDDQnrSIhoy+WoCEv73pW7e9+EDNvled3Tu+Dv3a9bwkG1GWY4BUlb7k3uchFKFmJWrGSh6SGL+V9/1i6ndAYuMnKyITq9S37ExIGjN2VYZ27d7zqPz5ah0EP89jbm//+E4mxmqoZ+hYP9/wT2Qm2sDH0V7IwlajuJoUTIjJjzNsitC9hDOVj0sqEINr46dUCAwEAAaOBvzCBvDAfBgNVHSMEGDAWgBR72gn1SV3Z11zJNvhV0huXnhEvfjA7BggrBgEFBQcBAQQvMC0wKwYIKwYBBQUHMAGGH2h0dHA6Ly9vY3NwLnJlZGhhdC5jb20vY2Evb2NzcC8wDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAtBgNVHREEJjAkgiJiei13ZWIuaG9zdC5xZS5lbmcucGVrMi5yZWRoYXQuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCF3eC5l2bX/7wXHr54gxp1E0cm+HLQ60X/BSQNHHRft7J8pswmYJ0QTz0/GkFPnpvruVf/QTZKT+xfXnfrIFlqdPVhD1Yt3ZRqBzvSYFREqEN5j9l44pHfPFd3cwQsnl9P4FrDWD2W9fcwS9uyJPc2oOtBNQCpyDTZz+X+m40c5cYZ3lHTsEaA65xHt6VWeRcfzIVs+2n6O9d9Pd34WtwjJLkrFuNUJEVvugTOnAq1+oJVNczgn0KFpWEGO+ATcd4BCc+b8S9/obxOChVzZsq826uyj1/eEaMMDlCC7ugo0RPnsJQcVzmZeuaLmj6xQep/p2+G0qCYauRCT8TtSUrr</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bz-web.host.qe.eng.pek2.redhat.com/saml2_logout.cgi"/> <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bz-web.host.qe.eng.pek2.redhat.com/saml2_logout.cgi"/> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bz-web.host.qe.eng.pek2.redhat.com/saml2_acs.cgi" index="0"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bz-web.host.qe.eng.pek2.redhat.com/saml2_acs.cgi" index="1"/> </md:SPSSODescriptor></md:EntityDescriptor>