diff --git a/etc/config/archives/elementary.key b/etc/config/archives/elementary.key
index 87fbbd965..56323a415 100644
--- a/etc/config/archives/elementary.key
+++ b/etc/config/archives/elementary.key
@@ -1,13 +1,31 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.0.10
+Version: Hockeypuck 2.2
 
-mI0ETocPBAEEANWiT0DBP5fpz2TB5kRG+SD2NUGVmFincQqxlHr2226gHwlObcNJKWWVt+F3
-3iORIMb85KXc5lihmdwu4WLRaLrmThEApMDD1uQGVgUrTA1QcJO+ma9+uph8OoLsiyw1YFOk
-lBRudx4RG+vBce/QKwNVPO/bKOYHVcFbuFQ74MfhABEBAAG0JExhdW5jaHBhZCBQUEEgZm9y
-IGVsZW1lbnRhcnkgT1MgdGVhbYi4BBMBAgAiBQJOhw8EAhsDBgsJCAcDAgYVCAIJCgsEFgID
-AQIeAQIXgAAKCRC/NplsTh+KWdvoA/4kAGaOfHqUzuDbzl6eEmPeskbHXUC9jFlnw7SCx6TC
-5/+IOZkT+71rte/R9VnLkJ4gy2bcdJATop83VTOt4u9A8FJUwLO9YGjaa0WN75r6vSHAYPEj
-XGgizlksadNiafQSS41B+/kGoGi93GPsXUn4lF/VCfyeHeBmzDVSZ/h37Q==
-=CwtG
+xsFNBGY0W70BEACjPRVK1K0yzj/TPI4AOEfjUFO7w4VHDBXV6tYo/jqjlqXNsnlh
+m2Ou+V6RvJUHvX7OBZIzXWaDnlYeLAho34nF82NV8SoZt6n8YvhKGg3sCqpfDxG2
+ZlsW/N3r1BH/o7bUiLrHmcT0e13qoH2qh0aZrkH6PdNSdxtoe74RNDJM3r5UKWY7
+sailTDftcLhM7pVgK4yno80JVIgWmaW6qg+/UpkF24gHuN9XDXsD4u8ppwRuZA1e
+FPWtlZhh6mkZwoKW+G3geVt5pyztm9wD25eGq5NfqbSkyCWtQuZtF2oG2KQV/qTI
+2Ga8J7lHXraaS+UGmh++AOSj4o0OkeutwFsBRAfJhWusY9etCGnY5+S4CB9ElJqd
+m9pSHrjQtjEtGRP0iDXGVR1m+15fkBcU70cp3IIkxKhcojOJmMhpc5e3H184dB8k
+0GarxMdMPCmABqNfTZa/RTBPvVQoC30TRlTsYDlBzsAtKxZ+HLrJ+KRuKjoisBTD
+zDeGRtLf+Q3gHF8LE8FmkKrDouR8QBL1U6BSev49XZnsB8m1IYH8fLY9ItuyPsjU
+myn4OBongmV3aSDkRNLjit5DOaCuSH7R6AtEGn4PHCBOq15tvGP/Jr73+QPii9RF
+8dH3xiIkSloB1dFOBJ9+kQokO1LoQOsKkYpF+98vmqJ9jsJy/hBqlmifsQARAQAB
+zSRMYXVuY2hwYWQgUFBBIGZvciBlbGVtZW50YXJ5IE9TIHRlYW3CwY4EEwEKADgW
+IQQ2SDfPkeBwkQIxwv6CGbOgrvPUmAUCZjRbvQIbAwULCQgHAgYVCgkICwIEFgID
+AQIeAQIXgAAKCRCCGbOgrvPUmFPmD/9R76nz346nc3jiEBuQDalV562Y7V16jITQ
+T0cQa1J0F1OivPkKKuiNYpstuAK88xoCSV7U50edVtWWMCqMQXAYzpwsIiNWaRV6
+9Z/c7xQnV0MIPVUaoKK6tFNANtRGApjjzkl+F5jQkgTzWOrJzfInj7n/QrkCIGfI
+GR6QXjeM/PcwmMCC7z5OiBi0YPG0SrNQcdDvCZffpppYMYndXZA4huc27ELjVNKS
+SbdWxczMRi/SpPqBount03DfbHAR7oNpXQwIvgUZ8BMKNJ3kVWLMS/qhbpMVLzPy
+E3c62kMkeX5i6BTAfxfdZOZgqSs+pELg4uBeuDdGO1ivlbCgnTnaqeKMcuX9b2s3
+qHjToNiub9JsjpP/q6EpfBVkF5ftdGLZ864EYup4df/BEGjxbYnenifaOFTLpb+K
+ncB3ZNAbkK80+7HrYbd61e2dZWWt6N0IrUllF/GoJPC8trUNoSDtZo8wVOQ7OHG7
+BmPmjwsj6Mf8I6wEjnKK/Lp1l+EVtnOIILypbHwiyaIsBbZJVSS/DaqQQoZyyp+u
+mb4mULGwDdMA7O+785Ktc3V2+tijgSSa7H21UOcoj0gDUe6IffmNs0C6P6e5LhHg
+xqbXPFit+vPyW19q9e+eILGLqKb2biCmApJyDKMKRPjAdL+c7c3C2CJeimp0eZuq
+QQ2R1C+7Og==
+=ivCt
 -----END PGP PUBLIC KEY BLOCK-----
 
diff --git a/etc/config/archives/patches.key b/etc/config/archives/patches.key
index 87fbbd965..56323a415 100644
--- a/etc/config/archives/patches.key
+++ b/etc/config/archives/patches.key
@@ -1,13 +1,31 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.0.10
+Version: Hockeypuck 2.2
 
-mI0ETocPBAEEANWiT0DBP5fpz2TB5kRG+SD2NUGVmFincQqxlHr2226gHwlObcNJKWWVt+F3
-3iORIMb85KXc5lihmdwu4WLRaLrmThEApMDD1uQGVgUrTA1QcJO+ma9+uph8OoLsiyw1YFOk
-lBRudx4RG+vBce/QKwNVPO/bKOYHVcFbuFQ74MfhABEBAAG0JExhdW5jaHBhZCBQUEEgZm9y
-IGVsZW1lbnRhcnkgT1MgdGVhbYi4BBMBAgAiBQJOhw8EAhsDBgsJCAcDAgYVCAIJCgsEFgID
-AQIeAQIXgAAKCRC/NplsTh+KWdvoA/4kAGaOfHqUzuDbzl6eEmPeskbHXUC9jFlnw7SCx6TC
-5/+IOZkT+71rte/R9VnLkJ4gy2bcdJATop83VTOt4u9A8FJUwLO9YGjaa0WN75r6vSHAYPEj
-XGgizlksadNiafQSS41B+/kGoGi93GPsXUn4lF/VCfyeHeBmzDVSZ/h37Q==
-=CwtG
+xsFNBGY0W70BEACjPRVK1K0yzj/TPI4AOEfjUFO7w4VHDBXV6tYo/jqjlqXNsnlh
+m2Ou+V6RvJUHvX7OBZIzXWaDnlYeLAho34nF82NV8SoZt6n8YvhKGg3sCqpfDxG2
+ZlsW/N3r1BH/o7bUiLrHmcT0e13qoH2qh0aZrkH6PdNSdxtoe74RNDJM3r5UKWY7
+sailTDftcLhM7pVgK4yno80JVIgWmaW6qg+/UpkF24gHuN9XDXsD4u8ppwRuZA1e
+FPWtlZhh6mkZwoKW+G3geVt5pyztm9wD25eGq5NfqbSkyCWtQuZtF2oG2KQV/qTI
+2Ga8J7lHXraaS+UGmh++AOSj4o0OkeutwFsBRAfJhWusY9etCGnY5+S4CB9ElJqd
+m9pSHrjQtjEtGRP0iDXGVR1m+15fkBcU70cp3IIkxKhcojOJmMhpc5e3H184dB8k
+0GarxMdMPCmABqNfTZa/RTBPvVQoC30TRlTsYDlBzsAtKxZ+HLrJ+KRuKjoisBTD
+zDeGRtLf+Q3gHF8LE8FmkKrDouR8QBL1U6BSev49XZnsB8m1IYH8fLY9ItuyPsjU
+myn4OBongmV3aSDkRNLjit5DOaCuSH7R6AtEGn4PHCBOq15tvGP/Jr73+QPii9RF
+8dH3xiIkSloB1dFOBJ9+kQokO1LoQOsKkYpF+98vmqJ9jsJy/hBqlmifsQARAQAB
+zSRMYXVuY2hwYWQgUFBBIGZvciBlbGVtZW50YXJ5IE9TIHRlYW3CwY4EEwEKADgW
+IQQ2SDfPkeBwkQIxwv6CGbOgrvPUmAUCZjRbvQIbAwULCQgHAgYVCgkICwIEFgID
+AQIeAQIXgAAKCRCCGbOgrvPUmFPmD/9R76nz346nc3jiEBuQDalV562Y7V16jITQ
+T0cQa1J0F1OivPkKKuiNYpstuAK88xoCSV7U50edVtWWMCqMQXAYzpwsIiNWaRV6
+9Z/c7xQnV0MIPVUaoKK6tFNANtRGApjjzkl+F5jQkgTzWOrJzfInj7n/QrkCIGfI
+GR6QXjeM/PcwmMCC7z5OiBi0YPG0SrNQcdDvCZffpppYMYndXZA4huc27ELjVNKS
+SbdWxczMRi/SpPqBount03DfbHAR7oNpXQwIvgUZ8BMKNJ3kVWLMS/qhbpMVLzPy
+E3c62kMkeX5i6BTAfxfdZOZgqSs+pELg4uBeuDdGO1ivlbCgnTnaqeKMcuX9b2s3
+qHjToNiub9JsjpP/q6EpfBVkF5ftdGLZ864EYup4df/BEGjxbYnenifaOFTLpb+K
+ncB3ZNAbkK80+7HrYbd61e2dZWWt6N0IrUllF/GoJPC8trUNoSDtZo8wVOQ7OHG7
+BmPmjwsj6Mf8I6wEjnKK/Lp1l+EVtnOIILypbHwiyaIsBbZJVSS/DaqQQoZyyp+u
+mb4mULGwDdMA7O+785Ktc3V2+tijgSSa7H21UOcoj0gDUe6IffmNs0C6P6e5LhHg
+xqbXPFit+vPyW19q9e+eILGLqKb2biCmApJyDKMKRPjAdL+c7c3C2CJeimp0eZuq
+QQ2R1C+7Og==
+=ivCt
 -----END PGP PUBLIC KEY BLOCK-----