diff --git a/roles/ipsilon/templates/saml2_data b/roles/ipsilon/templates/saml2_data
index f21d8ce041..d41d2255b4 100644
--- a/roles/ipsilon/templates/saml2_data
+++ b/roles/ipsilon/templates/saml2_data
@@ -2,3 +2,9 @@ pdcprod id = https://pdc.fedoraproject.org/saml2
 pdcprod type = SP
 pdcprod name = PDC
 pdcprod 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://pdc.fedoraproject.org/saml2"> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">  <md:KeyDescriptor use="signing">   <ds:KeyInfo>    <ds:X509Data>     <ds:X509Certificate>MIIFxjCCA64CCQDtbmoLbbd4dTANBgkqhkiG9w0BAQUFADCBpDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5NMRAwDgYDVQQHDAdSYWxlaWdoMRAwDgYDVQQKDAdSZWQgSGF0MRcwFQYDVQQLDA5GZWRvcmEgUHJvamVjdDEjMCEGA1UEAwwaU0FNTC1wZGMuZmVkb3JhcHJvamVjdC5vcmcxJjAkBgkqhkiG9w0BCQEWF2FkbWluQGZlZG9yYXByb2plY3Qub3JnMB4XDTE2MDEyNTE2MTA0OFoXDTE3MDEyNDE2MTA0OFowgaQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOTTEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UECgwHUmVkIEhhdDEXMBUGA1UECwwORmVkb3JhIFByb2plY3QxIzAhBgNVBAMMGlNBTUwtcGRjLmZlZG9yYXByb2plY3Qub3JnMSYwJAYJKoZIhvcNAQkBFhdhZG1pbkBmZWRvcmFwcm9qZWN0Lm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL1b8UHDPYDZ0P5KR+7s//5mD7B/okg+SDQVhFf7kxHRan4VaLhaod66skNbKui4gdJXtwEYCAu0i7j0siZXle1i2yXH5tbg9XYPKopylOcFjmG7XBY4wnZ+fKPsFh3IJEwSCP7DCS7kwPtK5ZEeaEKAZS10slmeM95Gci3Z9B6y++gRfvc4DnMqVlI8f/AmXWaDZF1ciiwf3JHLAauWl345llqiDbLmPimjJh8CGyx96WEjXLRi8wwbX8N2Zqjbcu6K6gt0H3/XQZXZNwXZQ4CIL2+wQGROs1SvQSsWUVopSxTYMJM2g7lCnw3UDdw5i4YvcN88w2SlmMjWpH2YzMUtrVFRlysgFLBa69U8Jzs6Ohf1BGfpIdwqdNCiivU1MAkOra0/Cm+xdECf4Fd9a7NZRVL1ce7auGGubSor7jo8/1SA4e9wOdMA4WSxjx09lNJTZRRlh6sZkB/Df2k3Hp4lIV37VrKaf3H5QyClvPXX9eNL0BILFBileTu89XwRr+YZq1goGA/6ahb5K82r82Mg5bU5GumYo2NUm9LJecsOqu/iyoIDGdxXGSmuz4YmRNpfYvzKSDJttaJ3MrH9TzHNMAiEKH+cJ5phtZjW8o7ESf+chNdjes/1nLSaOqgzJKkquIS7Glf4MPn6Hpu+etKsnar+w2W9iZH3t09IuYq/AgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAA1MQvVK8IZZ8UVxsDWX5lf3xVKG4U4frhg0ietfj7wPU33Y4LJN/IefXWMFx0gGlx4qdZXBGDZyUvz7pPnenoABmnQMFKZnVWzwgd3VtSRIEyWln1XkXSl9bawsd0ZglK6PXWGvNtKy1G98Szdu8b9vIxo+bWybXvqVbLNTD2lm6jvPcz82rfNjz/v7QwY+Ao1CwrVxu3m9xNDuANYCSmi2smcLdXvbFbI0oK5ZDeL/IfokiS4xxjdNl/np9oHDILUDDEZv9kMtEG9uIf09tKfWkF/1o7Ef18AtN/a6MXrJu1xGYOvj9Y8wNTAach1duP3nbrEk6bshI+Q8lsYzYfguEVl1K2OxGosYclJLyIkuF71AzO8EQUCpNCiGIb84uhcj8NGTwwGxi6dGyBrbM7JQLHb1NeYVnskdBuzdYc5KS/KZDL15ZIp1JKSgcokpvQS1LmRqqv0boAEaXroTBOPbQn8q3lFop6DPaoPKIcJKM/rqUWechRcwb6P9Z2wPtVo58un/lNYnGzIpKgDWJa40qj6NC/NnotFeAqF7uymC5u5IsKp14fjPONEOa0gH4XvXLkuOGwRjYfOs5wq5ZjKmy6fqzD37HcUADoXNKUNTBjnWW9VYRIEwfpbIt6SAw01/McPwVUGBE6Uk8+Hdhf3FBNTy3NyIdTzv/lrdZVLT</ds:X509Certificate></ds:X509Data>   </ds:KeyInfo>  </md:KeyDescriptor>  <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pdc.fedoraproject.org/saml2/logout"/>  <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pdc.fedoraproject.org/saml2/postResponse" index="0"/>  <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> </md:SPSSODescriptor></md:EntityDescriptor>
+
+
+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>
diff --git a/roles/ipsilon/templates/saml2_data_stg b/roles/ipsilon/templates/saml2_data_stg
index 28d32a5e38..e3a122a4a3 100644
--- a/roles/ipsilon/templates/saml2_data_stg
+++ b/roles/ipsilon/templates/saml2_data_stg
@@ -8,7 +8,3 @@ pdcstg type = SP
 pdcstg name = Product Definition Center STAGING
 pdcstg 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://pdc.stg.fedoraproject.org/saml2"><md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDGTCCAgGgAwIBAgIJAISFaB3/KZDhMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNVBAMMGHBkYy5mZWRvcmFpbmZyYWNsb3VkLm9yZzAeFw0xNTA5MzAxMDM4NTFaFw0yMDA5MjgxMDM4NTFaMCMxITAfBgNVBAMMGHBkYy5mZWRvcmFpbmZyYWNsb3VkLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLA2h4tYn7tAFwFZ2JBxLLcpIY55/NpdQP1yLSfvD4huT3rWRLoojiEpIM61qgnJmVsZ4oPkkSmU3pWLrjwZeD5XQimtg6GPHitjIIHhUgPDncpdGsbD1J/Jv7V/gj0CvI9ak0i9d0zxaKGaejP0VL78xeaEPf53LQywqrV9iGDRpcJzQZrqwUvrSIDRn7SmUNvDYQL6voAO6la/43CO8oIMiGE/qNs8sK/KupifxjN4BvZzK6ofpYqhycwJFHUTZ5mAEXspINIOr8I43ApF6+RDWyIt2G2GK7gwkLfNfb/3Lht8/oMjyiPvKuhSqaDbfcSwsU2A9k9vqV0ufL++VUCAwEAAaNQME4wHQYDVR0OBBYEFMy2MUOk6B9kN0nLDO4w7Ja/oL2dMB8GA1UdIwQYMBaAFMy2MUOk6B9kN0nLDO4w7Ja/oL2dMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHWk0SZYofIu0HP96D2RFghS7bcFGoTzG4uOK8v9cYtM3f3NO5NlmMNYeLG3wbBA+7pZgmIEReZkGlGq4kR4PqulKE4yymyuzIEUYFwlHfxrWCIH7/A211WxTQRXBGT2h4+uwpqOOOUdd8KHBdRIzYKiNEBjUgbya9fObxPZK2jx7zUqqa7KneEXaZ86LqPQU6+dv3i4yZE7PkeJ3Pl5wVSIJ7dxIN+81YhfuL3poknqDYmJ4QHNMcbS3gBaTTsUAUyfPXlAbWaGdypAuzxkwt9etX/bExs/0k28REwtZo9q04R48Ejlv4ckKIOFY7aO8saseB4A/n/oLfrW+/8qBnM=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pdc.stg.fedoraproject.org/saml2/logout"/><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pdc.stg.fedoraproject.org/saml2/postResponse" index="0"/><md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat></md:SPSSODescriptor></md:EntityDescriptor>
 
-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>