Merge branch 'master' into feature-fluffygate

setup.yml

@@ -49,6 +49,8 @@
 
     - galaxy/redis
     - galaxy/keydb
+    - galaxy/valkey
+
     - role: custom/matrix-authentication-service
     - custom/matrix-corporal
     - custom/matrix-appservice-draupnir-for-all
@@ -82,6 +84,7 @@
     - custom/matrix-bridge-mx-puppet-slack
     - custom/matrix-bridge-mx-puppet-twitter
     - custom/matrix-bridge-mx-puppet-instagram
+    - custom/matrix-bridge-postmoogle
     - custom/matrix-bridge-sms
     - custom/matrix-bridge-heisenbridge
     - custom/matrix-bridge-hookshot
@@ -91,7 +94,6 @@
     - custom/matrix-bot-buscarron
     - custom/matrix-bot-baibot
     - custom/matrix-bot-honoroit
-    - custom/matrix-bot-postmoogle
     - custom/matrix-bot-go-neb
     - custom/matrix-bot-mjolnir
     - custom/matrix-bot-draupnir
@@ -104,6 +106,7 @@
     - custom/matrix-synapse-reverse-proxy-companion
     - custom/matrix-dendrite
     - custom/matrix-conduit
+    - custom/matrix-conduwuit
     - custom/matrix-synapse-admin
     - custom/matrix-synapse-usage-exporter
     - galaxy/prometheus_node_exporter