diff --git a/roles/ipsilon/templates/saml2_data b/roles/ipsilon/templates/saml2_data
index 27d7e31e32..8bfc9ad4bd 100644
--- a/roles/ipsilon/templates/saml2_data
+++ b/roles/ipsilon/templates/saml2_data
@@ -47,7 +47,7 @@ rhbz id = https://bugzilla.redhat.com/saml2_metadata.cgi
 rhbz type = SP
 rhbz name = Red Hat Bugzilla
 rhbz Allowed Attributes = ["email"]
-rhbz 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://bugzilla.redhat.com/saml2_metadata.cgi" validUntil="2018-08-09T10:18:45Z"> <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>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</ds:X509Certificate>    </ds:X509Data>   </ds:KeyInfo>  </md:KeyDescriptor>  <md:KeyDescriptor use="signing">   <ds:KeyInfo>    <ds:X509Data>     <ds:X509Certificate>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</ds:X509Certificate>    </ds:X509Data>   </ds:KeyInfo>  </md:KeyDescriptor>  <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bugzilla.redhat.com/saml2_logout.cgi"/>  <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bugzilla.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://bugzilla.redhat.com/saml2_acs.cgi" index="0"/>  <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bugzilla.redhat.com/saml2_acs.cgi" index="1"/> </md:SPSSODescriptor> <md:ContactPerson contactType="technical">  <md:GivenName>Administrator</md:GivenName>  <md:EmailAddress>bugzilla-owner@redhat.com</md:EmailAddress> </md:ContactPerson></md:EntityDescriptor>
+rhbz 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://bugzilla.redhat.com/saml2_metadata.cgi" validUntil="2021-06-10T05:31:00Z"><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>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</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:KeyDescriptor use="signing"><ds:KeyInfo><ds:X509Data><ds:X509Certificate>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</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><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://bugzilla.redhat.com/saml2_acs.cgi" index="0"/><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bugzilla.redhat.com/saml2_acs.cgi" index="1"/></md:SPSSODescriptor><md:ContactPerson contactType="technical"><md:GivenName>Administrator</md:GivenName><md:EmailAddress>bugzilla-owner@redhat.com</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
 
 awx id = https://awx.fedoraproject.org/
 awx type = SP