diff --git a/images/openwrt.yaml b/images/openwrt.yaml
index bc298814..1dd5ea22 100644
--- a/images/openwrt.yaml
+++ b/images/openwrt.yaml
@@ -8,131 +8,7 @@ source:
   downloader: openwrt-http
   url: https://downloads.openwrt.org
   keys:
-  # 0x667205E379BAF348863A5C6688CA59E88F681580
-  - |-
-    -----BEGIN PGP PUBLIC KEY BLOCK-----
-    Comment: OpenWrt 21.02 public key
-
-    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
-    DAT8f8syxL8GNRw=
-    =Odut
-    -----END PGP PUBLIC KEY BLOCK-----
-
-  # 0x6768C55E79B032D77A28DA5F0F20257417E1CE16
-  - |-
-    -----BEGIN PGP PUBLIC KEY BLOCK-----
-
-    mQINBFr8KBIBEACua2CjanTmQN6z03u78RiNStHIMmBpykxZK7bbJDMIDwE7ewuW
-    L2HYbDR4Ls+bfB/ER9CP2wxQQMUGibbCaJQ+wsxnuQfzjazaBcupXbFfZwu79gzo
-    CtdBGFcbULjRBQKoF0gF8hYA8nJssMoXLPtxIUmQL4tP2dM5szpZ7F9M6ZgTnHCZ
-    eyUVhRS+aX2e8usfu1mdLqQIwWXaDTT70anJMRtHmjCEE6hf0MFYqLooqjVUFTTU
-    fZj65ZSF+PsHwj2uUPXG0lh0jx1jhSnIFOn9Doek/LGPPvKWl43xs/R/axR/Rejh
-    Osh8HwBsVeo6xJeVDOSl6icch949cId1BKGcC2p4DyRJMYYymRBv5XTp1MfSecDI
-    Wd8uN+ilBSSkTEnNfxZ/b/G88hXKsAh1UigeWyGg/PrYnkD3gWeejOOihmG2Ckre
-    g9Stoidx+oDVVhH8Y5IiqZrfv4lB2UcEJ1G9+EUZC7uGUz3fcxHdWZjuaOxiWL3y
-    ydQrBSGpPv+DDt2HtDhg3gjZi9XCvbIEeGeeqPWwWzBCK6Yum2KzdtmpaZr88LVn
-    4SR9qtyQ1FrGsXoZJRRwa5hlw05I1m24kNIY+NUNX8fT1KdRbwW/ut4hpxMwPJ4+
-    fJhYfM/WGC3ayIG3J5HsiiMk9C3CUBWnH/4iuSbyryqj2LUewtAu2L9KwwARAQAB
-    tE1PcGVuV3J0IFJlbGVhc2UgQnVpbGRlciAoMTguMDYgU2lnbmluZyBLZXkpIDxv
-    cGVud3J0LWRldmVsQGxpc3RzLm9wZW53cnQub3JnPokCHAQQAQIABgUCXBfYfQAK
-    CRCDPGAQ1Su7azu+EACNZmuoerpnqilnO40ae1zbJxGkHpYXt/VtNOp4xXh07dUt
-    DRHg5Zw6xpqEciFH976lwVuy8uyI9NVLvtzajpRPLgKYIW2f3a+vqYX70L++3C0F
-    oD1DDm6gAvGIiW/rYUFT7ASiNN+mz4Nxwm1krfxM9pg2D0JLze0xi5W8OiXnQGnd
-    KTJ8C9FNJcEYW8Zrk+TQ0+L8MctLTVPVFs12fw2XgS6UkY2O6o4d3eTWXADUhcZF
-    FRLQYEE2n7UrlZQagzx1+PYqrbsn24jrC1Mx1EDXG8W5iF4SKoWvoNjFEYdVjAf3
-    3wCWF0tTHtQO3hWzhS+PRIODdzRjtq2arzr82aq9SQVZ0zHUAzBQ9B5PYFMnaYX2
-    SankCmims0+ZPvD8DZFLdFsZ09XmJrYwV7d8mdjvNGsgGbisMyILQfrBQknRrUjQ
-    +hSo2h/gfKLmJkr6c0YGlx+zkHzxHnhpla9NB2mryNCV+9umQ02SfRf5Dnb+l8SR
-    hiv9nmxgYByoSx4AEz72NyIoGGtz0cO/4Ju1wU2J9seN8x1yTfybkTCHZNfLSbTf
-    +ArFVlLv6iQT0n5NsUQU2Ff/kNBlSyCfSQ5p6WezagqSGdRGGjYpdhDMx57HX8/j
-    N1RHZ2h5bxkidzvw9wOop1EzGEL2MyitqyuGIXJrb7K+mi0i+UwHQIvUfxLLPokC
-    MwQQAQgAHRYhBAJsoFCnvZj3no5xq3ha65XxkynABQJcVjPhAAoJEHha65XxkynA
-    FsQP/0jxR4TSylVgkLD6nd4s4Yo8304DUYOkcf/QsjIw1G34A4whtXGQKwo7USZA
-    Rc6SO/d2wS+82joS9cjPlPd6Afdlvm3sPOEGqdMyAtNxI/QxkK2kiW5eo815Euh7
-    Zivy2qnHFmGZqJoLjZzeJhGMVtZtU7+t7cMZe/7Jkv7w4MqPqHjM8PisCpvwtEp3
-    vuqmH3rAZinBD1bFUNNzJZ5I9U3m7TInY+a0wZCHrtQmvDNrNokkkyYuf8XSSoXU
-    ojq9i6zab/HI+uloS9RPuGljHvPE/u8HbNLtU1R8SUTFVFOXTvTOLab5YT7TGczk
-    aE/RD0qg0E1azSque129P6awMisxmZuhXF1c3fmpuhfNgjJBn1wBCkNbXuBCqMG1
-    7tCR58O4E4yOGotF74AM5bP6x1RoqzlM2px2T0aHDr9nCmLwaGPi+xJJwDsI8kRL
-    CprSB6v2Wu1WPjo+FiBqZt1MiXUC8bW/mLcyQZznBTnP8qjiwTVez0oMRunZ1Lx0
-    pcDjJOxg2qB50hu3w3cxFbIlcT5GPMQp+luz9K14tTPESEWwSA0acGGOMo8y8YYM
-    prJcagy3xzhD+1og1jS2Elz27WQ2Hsa5HQc1EkVyrUJ8GPVo/M3ncdxijIlDvkvI
-    y/MM7MO+W4/jo8VE1F/3tYUN8EKdyo4fZq+Jz8FviEbu/T+jiQIzBBABCAAdFiEE
-    ZZiFPFwuxEvzYiJLOqH1s0fZQIYFAlwX4vEACgkQOqH1s0fZQIal1Q/9FD1L/ryd
-    P0LwjBXKTah09YtpAwEeck/BFSWj+K3VuTSz58uNwE/WbLeVCF7scqKYOA8q/TY8
-    DI9PM4Wu9fY2LZ2x9+FCCule3n8mdy26DtC9wfFQHvJwFJH4geQXi/NVgQxFKHET
-    V235oV/oN86ZjlbTN6i3E9OB2lHpesnVooia6Q/vMIiASxEpSHVf1+Zwdm4jqCXl
-    yOVzLkhuMgGbEhwXZvCAkggMv+xb/ebxIS8N0rfXzowdAjtJYxdi3/1uWTebBAX1
-    2xDxyU6OWhgPIl+bxXUYT6+1g+EHxKrl3PB94Il/iLgIn9U/oEOchpc+bFc/x12x
-    yVgpiYrfqNs7NojoYHLDtt5GbCevZgN6uEo7S4IvzCMm8ctJPjjrM5kVIGmq0024
-    t+E5oe6FGa1eBJ3kUvjKV+/wFFHUlqVcdTgEujPE5ODO6zBwtIJ2gfOTd1qs3jJH
-    Xf0abC961sBrHDGGjncHd2e2EXcZ/Qoa+s/wQnw5FS6d+pW4kq9fKr3FyQbL9lQ7
-    uaWg9aoGbEZXVk/0fh9vcAudp7aUy1UTRFBGoG61SLjUJ/DgGQ+zIac8go5Pi++y
-    sZVslfHoovwUj5mNlCrGQWyTSOTCrwIZoeQ8SXJEWSbfx8ELRYA8iT8hHWIYnL/0
-    4aKB2CqNHIYe0IeVaMrDDROU4V+bvfgZ6SSJAj4EEwECACgFAlr+f4ICGwMFCQPC
-    ZwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEA8gJXQX4c4WO6wP/086Q+TF
-    lBTq301KoAZDX//OfAyhoT0k3pFU2/BbPODHts0Pjwn/Vug3iai332pesbIqQDXs
-    z92S8kOHodHbHVLEUfzg21UToZajWQpUP3jOxizAKUR7q+gTHJElSu1rCYvA931H
-    n33/DwU/OCXyJ9E876q46pQHT7/aAxsZRpGiqWaYplZ9etbRnLU7bSisGc30uAcb
-    qf/7JYdN7s9wBGrXtzBUmH9VrBIoJwTxb99T63SHwbdgOEiWE9cc+n9m8BSgso7N
-    wzTlQrfF45iQpR6yYIiyIKxbPxEqfZqARnefLHKZY/7Ja6SXab0sAcNruwMKcxpi
-    FPJfGs5pdDPfPJnaDhZA22oWOvyy99yE/PKPnV24gRN5fHGCCwBa6MQoBb5FnCb/
-    0Lo/d2a+6dvHnwq0RzGK6fA+HW6nU4nQvv2nJpae5sv0Cus6XpotlUVNE9oL3/4L
-    7q1qciX4KepncRhoBwkI3Kmlt3++jAEe0/pECk/IsvoBiLeV6Vveo5RHXbWruw/y
-    hllirDlFyogLtkeb6Sw5fifRhjGxgeo9Cnalh2xQpQmGWI5ZZtCzANgqMRMktJiB
-    Bt3lA7eJUeftdXa2VzrC3w6gnTUlyREWFelc87VTz3kr+mlCQTZnZ2T4jyxftEa6
-    lg1USTfWIwpIdqEO+0845jh0jIZH0iFNwMCw
-    =fdAa
-    -----END PGP PUBLIC KEY BLOCK-----
-
-  # 0x54CC74307A2C6DC9CE618269CD84BCED626471F1
+  # 0x54CC74307A2C6DC9CE618269CD84BCED626471F1 (PGP key for unattended snapshot builds and 23.05, pub key)
   - |-
     -----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -210,7 +86,7 @@ source:
     =kEox
     -----END PGP PUBLIC KEY BLOCK-----
 
-  # 0x6D9278A33A9AB3146262DCECF93525A88B699029
+  # 0x6D9278A33A9AB3146262DCECF93525A88B699029 (PGP key for unattended snapshot builds and 23.05, sub key)
   - |-
     -----BEGIN PGP PUBLIC KEY BLOCK-----