diff --git a/operating-systems/buer.scm b/operating-systems/buer.scm
index 204b41c..e6a88c8 100644
--- a/operating-systems/buer.scm
+++ b/operating-systems/buer.scm
@@ -77,19 +77,17 @@
                       #:prefix build-machine:)
   #|C|# #:use-module ((buer channels)
                       #:prefix channel:)
+  #|F|# #:use-module ((buer files)
+                      #:prefix file:)
   #|P|# #:use-module ((buer privilege)
                       #:prefix privileged-programs:)
   #|R|# #:use-module ((buer rules)
                       #:prefix rules:)
+  #|S|# #:use-module ((buer substitute-keys)
+                      #:prefix substitute-key:)
   #|U|# #:use-module ((buer users)
                       #:prefix user:)
 
-  #|Buer files|#
-  #|S|# #:use-module ((buer files substitute-keys)
-                      #:prefix substitute-key:)
-  #|T|# #:use-module ((buer files thinkfan)
-                      #:prefix file:thinkfan-)
-
   #|SRFIs|#
   #|1|# #:use-module (srfi srfi-1)
 
@@ -229,6 +227,7 @@
                     (discover? #t)
                     (authorized-keys
                      (cons* substitute-key:genenetwork.pub
+                            substitute-key:yumiko.pub
                             %default-authorized-guix-keys))
                     (substitute-urls
                       `("https://ci.guix.gnu.org"